Skip to content

Commit e191626

Browse files
AtionAtion
committed
Release 0.91.2
2 parents 640253f + b82d14f commit e191626

File tree

8 files changed

+35
-17
lines changed

8 files changed

+35
-17
lines changed

‎BlockSettleUILib/Trading/RFQTicketXBT.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,11 @@ void RFQTicketXBT::fillRecvAddresses()
357357
bool RFQTicketXBT::preSubmitCheck()
358358
{
359359
if (currentGroupType_ == ProductGroupType::XBTGroupType) {
360+
361+
if (authAddressManager_->GetState(authAddr_) == AuthAddressManager::AuthAddressState::Verified) {
362+
return true;
363+
}
364+
360365
const auto qty = getQuantity();
361366
const auto& tradeSettings = authAddressManager_->tradeSettings();
362367
assert(tradeSettings);

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ set(QML2_IMPORT_PATH "${BLOCK_SETTLE_ROOT}/BlockSettleSigner/qml" CACHE STRING "
8484
# Terminal, PB, PuB and offline tools share same version for consistency
8585
SET(BS_VERSION_MAJOR 0 )
8686
SET(BS_VERSION_MINOR 91 )
87-
SET(BS_VERSION_PATCH 1 )
87+
SET(BS_VERSION_PATCH 2 )
8888
SET(BS_VERSION_STRING "${BS_VERSION_MAJOR}.${BS_VERSION_MINOR}.${BS_VERSION_PATCH}")
8989

9090
include(GetGitRevisionDescription)

‎Deploy/Ubuntu/DEBIAN/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: bsterminal
2-
Version: 0.91.1
2+
Version: 0.91.2
33
Section: x11
44
Priority: optional
55
Architecture: amd64

‎Deploy/Windows/bsterminal.nsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SetCompressor /SOLID lzma
44
# General Symbol Definitions
55
!define COMPANY "BlockSettle AB"
66
!define URL http://blocksettle.com/
7-
!define VERSION "0.91.1"
7+
!define VERSION "0.91.2"
88
!define PRODUCT_NAME "BlockSettle Terminal"
99

1010
# MultiUser Symbol Definitions

‎Jenkinsfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ pipeline {
2525
}
2626
stage('Build MacOSX app') {
2727
steps {
28-
sh 'ssh admin@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
29-
sh 'ssh admin@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'
30-
sh 'ssh admin@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/admin/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'
31-
sh "scp admin@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
28+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
29+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${TAG} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common ; git submodule init ; git submodule update"'
30+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh -production"'
31+
sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
3232
}
3333
}
3434
stage('Build Windows app') {

‎Jenkinsfile2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ pipeline {
3838
expression { params.OS == 'MacOS' || params.OS == 'All' }
3939
}
4040
steps {
41-
sh 'ssh admin@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
42-
sh 'ssh admin@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'
43-
sh 'ssh admin@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/admin/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
44-
sh "scp admin@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
41+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
42+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch ${BRANCH} https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git submodule init ; git submodule update"'
43+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
44+
sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
4545
}
4646
}
4747
stage('Build Windows app') {

‎Jenkinsfile_nightly‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ pipeline {
3838
expression { params.OS == 'MacOS' || params.OS == 'All' }
3939
}
4040
steps {
41-
sh 'ssh admin@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
42-
sh 'ssh admin@${MACOS_HOST_IP} "cd ~/Workspace ; git clone --single-branch --branch bs_dev git@github.com:BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git checkout bs_dev ; git pull ; git submodule init ; git submodule update"'
43-
sh 'ssh admin@${MACOS_HOST_IP} "export PATH=/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin ; ccache -s ; cd /Users/admin/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
44-
sh "scp admin@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
41+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "rm -rf ~/Workspace/terminal"'
42+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "mkdir -p ~/Workspace; cd ~/Workspace ; git clone --single-branch --branch bs_dev https://github.com/BlockSettle/terminal.git ; cd terminal ; git submodule init ; git submodule update ; cd common; git checkout bs_dev ; git pull ; git submodule init ; git submodule update"'
43+
sh 'ssh ${MACOS_HOST_USER}@${MACOS_HOST_IP} "export PATH=/Users/${MACOS_HOST_USER}/.pyenv/shims:/usr/local/opt/ccache/libexec:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin; ccache -s ; cd /Users/${MACOS_HOST_USER}/Workspace/terminal/Deploy/MacOSX ; security unlock-keychain -p ${MAC_CHAIN_PAS} login.keychain ; ./package.sh"'
44+
sh "scp ${MACOS_HOST_USER}@${MACOS_HOST_IP}:~/Workspace/terminal/Deploy/MacOSX/BlockSettle.dmg ${WORKSPACE}/terminal/Deploy/BlockSettle.dmg"
4545
}
4646
}
4747
stage('Build Windows app') {

‎changelog.json‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
{
2-
"latest_version": "0.91.1",
3-
"release_date": "30 Oct 2020",
2+
"latest_version": "0.91.2",
3+
"release_date": "17 Nov 2020",
44
"changes": [
5+
{
6+
"version_string": "0.91.2",
7+
"previous_version": "0.91.1",
8+
"release_date": "17 Nov 2020",
9+
"release_type": "prod",
10+
"improvements": [
11+
],
12+
"bug_fixes": [
13+
"Fix XBT limit validation on submitted auth address"
14+
],
15+
"revision": "0ba354aa1",
16+
"common_revision": "772fedb1"
17+
},
518
{
619
"version_string": "0.91.1",
720
"previous_version": "0.91.0",

0 commit comments

Comments
 (0)