From 93250ab664fddea698b2284d5ad20558ff3b81a7 Mon Sep 17 00:00:00 2001 From: Ravin Perera <33562092+ravinsp@users.noreply.github.com> Date: Wed, 22 Sep 2021 09:28:39 +0530 Subject: [PATCH] Renamed docker images to use hp-latest image. (#61) * Renamed docker images to use hp-latest image. * Updated hp client lib. --- examples/client/lib/hp-client-lib.js | 11 ++++++----- examples/message-board/message-board.js | 4 ++-- examples/sample-user-wallet/user-wallet.js | 2 +- installer/registry-install.sh | 2 +- src/conf.cpp | 4 ++-- test/docker/Dockerfile.ubt.20.04 | 2 +- test/docker/Dockerfile.ubt.20.04-njs | 2 +- test/docker/build.sh | 4 ++-- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/client/lib/hp-client-lib.js b/examples/client/lib/hp-client-lib.js index 73daeb6..b0fe86a 100644 --- a/examples/client/lib/hp-client-lib.js +++ b/examples/client/lib/hp-client-lib.js @@ -22,7 +22,7 @@ TextDecoder = util.TextDecoder; } - const supportedHpVersion = "0.5."; + const supportedHpVersion = "0.6."; const serverChallengeSize = 16; const outputValidationPassThreshold = 0.8; const connectionCheckIntervalMs = 1000; @@ -552,7 +552,7 @@ if (connectionStatus == 0 && m.type == "user_challenge" && m.hp_version && m.contract_id) { if (!m.hp_version.startsWith(supportedHpVersion)) { - liblog(1, `Incompatible Hot Pocket server version. Expected:${supportedHpVersion} Got:${m.hp_version}`); + liblog(1, `Incompatible Hot Pocket server version. Expected:${supportedHpVersion}* Got:${m.hp_version}`); return false; } else if (!m.contract_id) { @@ -663,11 +663,12 @@ hpVersion: m.hp_version, ledgerSeqNo: m.ledger_seq_no, ledgerHash: msgHelper.deserializeValue(m.ledger_hash), - inSync: m.in_sync, + voteStatus: m.vote_status, roundTime: m.round_time, contractExecutionEnabled: m.contract_execution_enabled, readRequestsEnabled: m.read_requests_enabled, isFullHistoryNode: m.is_full_history_node, + weaklyConnected: m.weakly_connected, currentUnl: m.current_unl.map(u => msgHelper.deserializeValue(u)), peers: m.peers }); @@ -690,8 +691,8 @@ const ev = { event: m.event }; if (ev.event == "ledger_created") ev.ledger = msgHelper.deserializeLedger(m.ledger); - else if (ev.event == "sync_status") - ev.inSync = m.in_sync; + else if (ev.event == "vote_status") + ev.voteStatus = m.vote_status; emitter.emit(events.ledgerEvent, ev); } else if (m.type == "health_event") { diff --git a/examples/message-board/message-board.js b/examples/message-board/message-board.js index 4dfc81e..d85e9c0 100644 --- a/examples/message-board/message-board.js +++ b/examples/message-board/message-board.js @@ -259,7 +259,7 @@ const interatctiveInterface = async () => { type: 'create', owner_pubkey: 'ed5cb83404120ac759609819591ef839b7d222c84f1f08b3012f490586159d2b50', contract_id: contractId, - image: (image == "1" ? "hp.0.5-ubt.20.04" : "hp.0.5-ubt.20.04-njs.14"), + image: (image == "1" ? "hp.latest-ubt.20.04" : "hp.latest-ubt.20.04-njs.14"), config: ret !== -1 ? createConfig : undefined })); break; @@ -379,7 +379,7 @@ const restApi = async () => { type: 'create', owner_pubkey: req.body.owner_pubkey, contract_id: (req.body.contract_id === "") ? uuidv4() : req.body.contract_id, - image: req.body.image ? req.body.image : "hp.0.5-ubt.20.04" + image: req.body.image ? req.body.image : "hp.latest-ubt.20.04" }; sendToAgent(JSON.stringify(msg), res); }); diff --git a/examples/sample-user-wallet/user-wallet.js b/examples/sample-user-wallet/user-wallet.js index d37bafb..4b2d148 100644 --- a/examples/sample-user-wallet/user-wallet.js +++ b/examples/sample-user-wallet/user-wallet.js @@ -335,7 +335,7 @@ class TestUser { type: 'create', owner_pubkey: OWNER_PUBKEY, contract_id: contractId, - image: (image == "1" ? "hp.0.5-ubt.20.04" : "hp.0.5-ubt.20.04-njs.14"), + image: (image == "1" ? "hp.latest-ubt.20.04" : "hp.latest-ubt.20.04-njs.14"), config: ret !== -1 ? createConfig : {} }; diff --git a/installer/registry-install.sh b/installer/registry-install.sh index 744af53..1318f3a 100755 --- a/installer/registry-install.sh +++ b/installer/registry-install.sh @@ -5,7 +5,7 @@ docker_bin=$1 user=$2 port=$3 hubacc="hotpocketdev" -images=("sashimono:hp.0.5-ubt.20.04" "sashimono:hp.0.5-ubt.20.04-njs.14") +images=("sashimono:hp.latest-ubt.20.04" "sashimono:hp.latest-ubt.20.04-njs.14") user_dir=/home/$user # Check if users already exists. diff --git a/src/conf.cpp b/src/conf.cpp index 18d6d80..dfe3e8a 100644 --- a/src/conf.cpp +++ b/src/conf.cpp @@ -69,8 +69,8 @@ namespace conf cfg.system.max_storage_kbytes = 5242880; // Total 5GB const std::string img_prefix = registry_addr.empty() ? "hotpocketdev" : std::string(registry_addr); - cfg.docker.images["hp.0.5-ubt.20.04"] = img_prefix + "/sashimono:hp.0.5-ubt.20.04"; - cfg.docker.images["hp.0.5-ubt.20.04-njs.14"] = img_prefix + "/sashimono:hp.0.5-ubt.20.04-njs.14"; + cfg.docker.images["hp.latest-ubt.20.04"] = img_prefix + "/sashimono:hp.latest-ubt.20.04"; + cfg.docker.images["hp.latest-ubt.20.04-njs.14"] = img_prefix + "/sashimono:hp.latest-ubt.20.04-njs.14"; cfg.log.max_file_count = 50; cfg.log.max_mbytes_per_file = 10; diff --git a/test/docker/Dockerfile.ubt.20.04 b/test/docker/Dockerfile.ubt.20.04 index 735b314..603dac8 100644 --- a/test/docker/Dockerfile.ubt.20.04 +++ b/test/docker/Dockerfile.ubt.20.04 @@ -1,4 +1,4 @@ -FROM hotpocketdev/hotpocket:0.5-ubt.20.04 +FROM hotpocketdev/hotpocket:latest-ubt.20.04 RUN apt-get update \ && apt-get install --no-install-recommends -y unzip jq \ diff --git a/test/docker/Dockerfile.ubt.20.04-njs b/test/docker/Dockerfile.ubt.20.04-njs index a043bfc..b749d2f 100644 --- a/test/docker/Dockerfile.ubt.20.04-njs +++ b/test/docker/Dockerfile.ubt.20.04-njs @@ -1,4 +1,4 @@ -FROM hotpocketdev/hotpocket:0.5-ubt.20.04-njs.14 +FROM hotpocketdev/hotpocket:latest-ubt.20.04-njs.14 RUN apt-get update \ && apt-get install --no-install-recommends -y unzip jq \ diff --git a/test/docker/build.sh b/test/docker/build.sh index ac0c8d2..d6b07d0 100755 --- a/test/docker/build.sh +++ b/test/docker/build.sh @@ -2,5 +2,5 @@ img=hotpocketdev/sashimono -docker build -t $img:hp.0.5-ubt.20.04 -f ./Dockerfile.ubt.20.04 . -docker build -t $img:hp.0.5-ubt.20.04-njs.14 -f ./Dockerfile.ubt.20.04-njs . \ No newline at end of file +docker build -t $img:hp.latest-ubt.20.04 -f ./Dockerfile.ubt.20.04 . +docker build -t $img:hp.latest-ubt.20.04-njs.14 -f ./Dockerfile.ubt.20.04-njs . \ No newline at end of file