From 4bb620b79e832eeb9b99b146d79281374a1b44c9 Mon Sep 17 00:00:00 2001 From: kellyshang Date: Mon, 25 Oct 2021 14:37:15 +0800 Subject: [PATCH 1/4] feat: upgrade ckb version and ckb-indexer version --- .ckb-version | 2 +- scripts/download-ckb.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ckb-version b/.ckb-version index cb2705d369..cb3e518ebd 100644 --- a/.ckb-version +++ b/.ckb-version @@ -1 +1 @@ -v0.100.0 +v0.101.0 diff --git a/scripts/download-ckb.sh b/scripts/download-ckb.sh index d81cc85bfe..65933b049a 100755 --- a/scripts/download-ckb.sh +++ b/scripts/download-ckb.sh @@ -3,7 +3,7 @@ CKB_VERSION=$(cat .ckb-version) ROOT_DIR=$(pwd) # Be sure to run this from root directory! MERCURY_VERSION="v0.1.0-rc.3" -CKB_INDEXER_VERSION="0.3.0" +CKB_INDEXER_VERSION="0.3.1" function download_ckb_indexer_macos() { FILENAME="ckb-indexer-${CKB_INDEXER_VERSION}-macos" From ab1d84d4059273d8ec27919583b12a5f2bb25830 Mon Sep 17 00:00:00 2001 From: kellyshang Date: Mon, 25 Oct 2021 14:46:51 +0800 Subject: [PATCH 2/4] fix: update notification about synchronization --- packages/neuron-ui/src/locales/en.json | 2 +- packages/neuron-ui/src/locales/zh-tw.json | 2 +- packages/neuron-ui/src/locales/zh.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json index a426665463..6693a5c08b 100644 --- a/packages/neuron-ui/src/locales/en.json +++ b/packages/neuron-ui/src/locales/en.json @@ -526,7 +526,7 @@ "402": "CKB App does not open. Please open the CKB App on your device.", "403": "No device detected. Please connect your device.", "404": "Multiple device detected. Only one device of the same model can be connected.", - "600": "Please make sure the sync has finalized before you do any operation." + "600": "Please make sure the sync has finalized before you do any transaction related operation." } }, "sync": { diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json index c1a968ba00..262bc9a45c 100644 --- a/packages/neuron-ui/src/locales/zh-tw.json +++ b/packages/neuron-ui/src/locales/zh-tw.json @@ -519,7 +519,7 @@ "402": "CKB 應用未打開。請在妳的設備打開 CKB 應用。", "403": "未檢測到設備，請檢查妳的設備連接。", "404": "檢測到多個設備，同一型號的設備只能同時連接一個。", - "600": "做任何錢包操作前請先確保同步已完成。" + "600": "做任何交易相關的錢包操作前請先確保同步已完成。" } }, "sync": { diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index f013fbce22..520fcb24ea 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -519,7 +519,7 @@ "402": "CKB 应用未打开。请在你的设备打开 CKB 应用。", "403": "未检测到设备，请检查你的设备连接。", "404": "检查到多个设备，同一型号的设备只能同时连接一个。", - "600": "做任何钱包操作前请先确保同步已完成。" + "600": "做任何交易相关的钱包操作前请先确保同步已完成。" } }, "sync": { From 644a6ddc790d5e7c7a79dd70961f183f8e6cc564 Mon Sep 17 00:00:00 2001 From: kellyshang Date: Mon, 25 Oct 2021 14:55:59 +0800 Subject: [PATCH 3/4] fix: update change related warning --- packages/neuron-ui/src/locales/en.json | 6 +++--- packages/neuron-ui/src/locales/zh-tw.json | 6 +++--- packages/neuron-ui/src/locales/zh.json | 6 +++--- packages/neuron-wallet/src/locales/en.ts | 4 ++-- packages/neuron-wallet/src/locales/zh-tw.ts | 4 ++-- packages/neuron-wallet/src/locales/zh.ts | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json index 6693a5c08b..aaa053071d 100644 --- a/packages/neuron-ui/src/locales/en.json +++ b/packages/neuron-ui/src/locales/en.json @@ -492,8 +492,8 @@ "102": "$t(messages.fields.{{fieldName}}) is invalid.", "103": "$t(messages.fields.keystore-password) is incorrect.", "104": "Fail to connect to the node, please restart Neuron.", - "105": "You need more capacities for change (at least 61 CKBytes).", - "106": "You need more capacities for change (at least 61 CKBytes), or slide to the end to send all your balance.", + "105": "You need more capacities for change (more than 61 CKBytes).", + "106": "You need more capacities for change (more than 61 CKBytes), or slide to the end to send all your balance.", "107": "The amount {{amount}} CKB is too small, transfer with locktime requires an amount no less than 69 CKB.", "108": "The given address does not belong to current wallet. Please check your wallet or wait for synchronizing complete.", "109": "Insufficient balance.", @@ -502,7 +502,7 @@ "112": "Wallet {{id}} not found.", "113": "Keystore is invalid, please check your file integrity.", "114": "The minimal transfer balance is {{bytes}} CKBytes.", - "115": "You need more capacities for change (at least 61 CKBytes), or click 'Max' button to send all your balance.", + "115": "You need more capacities for change (more than 61 CKBytes), or click 'Max' button to send all your balance.", "201": "$t(messages.fields.{{fieldName}}) is required.", "202": "$t(messages.fields.{{fieldName}}) {{fieldValue}} is used.", "203": "$t(messages.fields.{{fieldName}}) {{fieldValue}} is too long, it should be shorter than or equal to {{length}}.", diff --git a/packages/neuron-ui/src/locales/zh-tw.json b/packages/neuron-ui/src/locales/zh-tw.json index 262bc9a45c..71450beefd 100644 --- a/packages/neuron-ui/src/locales/zh-tw.json +++ b/packages/neuron-ui/src/locales/zh-tw.json @@ -485,8 +485,8 @@ "102": "$t(messages.fields.{{fieldName}})無效。", "103": "$t(messages.fields.keystore-password)不正確。", "104": "未連接到節點，請重啓 Neuron。", - "105": "您需要有足夠的餘額來支付找零(至少61 CKBytes)。", - "106": "您需要有足夠的餘額來支付找零(至少61 CKBytes)，或者拖動滑塊到最右端發送全部餘額。", + "105": "您需要有足夠的餘額來支付找零(大于 61 CKBytes)。", + "106": "您需要有足夠的餘額來支付找零(大于 61 CKBytes)，或者拖動滑塊到最右端發送全部餘額。", "107": "金額 {{amount}} CKB 太小，含鎖定時間轉帳需要輸入一個不小於 69 CKB 的值。", "108": "當前錢包地址列表中不包含輸入地址，請檢查錢包設置或等待同步完成。", "109": "餘額不足。", @@ -495,7 +495,7 @@ "112": "未找到錢包 {{id}}。", "113": "Keystore 格式錯誤，請檢查檔案完整性。", "114": "最小轉帳金額為 {{bytes}} CKBytes。", - "115": "您需要有足夠的餘額來支付找零(至少61 CKBytes)，或者點擊 'Max' 按鈕發送全部餘額。", + "115": "您需要有足夠的餘額來支付找零(大于 61 CKBytes)，或者點擊 'Max' 按鈕發送全部餘額。", "201": "缺少$t(messages.fields.{{fieldName}})。", "202": "$t(messages.fields.{{fieldName}}) {{fieldValue}} 已被使用。", "203": "$t(messages.fields.{{fieldName}}) {{fieldValue}} 太長，其長度應不超過 {{length}}。", diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index 520fcb24ea..76face3527 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -485,8 +485,8 @@ "102": "$t(messages.fields.{{fieldName}})无效。", "103": "$t(messages.fields.keystore-password) 不正确。", "104": "未连接到节点，请重启 Neuron。", - "105": "您需要有足够的余额来支付找零（至少 61 CKBytes）。", - "106": "您需要有足够的余额来支付找零（至少 61 CKBytes），或者拖动滑块到最右端发送全部余额。", + "105": "您需要有足够的余额来支付找零（大于 61 CKBytes）。", + "106": "您需要有足够的余额来支付找零（大于 61 CKBytes），或者拖动滑块到最右端发送全部余额。", "107": "金额 {{amount}} CKB 太小, 含锁定时间转账需要输入一个不小于 69 CKB 的值。", "108": "当前钱包地址列表中不包含输入地址，请检查钱包设置或等待同步完成。", "109": "余额不足。", @@ -495,7 +495,7 @@ "112": "未找到钱包 {{id}}。", "113": "Keystore 格式不正确，请检查文件完整性。", "114": "最小转账金额为 {{bytes}} CKBytes。", - "115": "您需要有足够的余额来支付找零（至少 61 CKBytes），或者点击 'Max' 按钮发送全部余额。", + "115": "您需要有足够的余额来支付找零（大于 61 CKBytes），或者点击 'Max' 按钮发送全部余额。", "201": "缺少$t(messages.fields.{{fieldName}})。", "202": "$t(messages.fields.{{fieldName}}) {{fieldValue}} 已被使用。", "203": "$t(messages.fields.{{fieldName}}) {{fieldValue}} 太长, 其长度应不超过 {{length}}。", diff --git a/packages/neuron-wallet/src/locales/en.ts b/packages/neuron-wallet/src/locales/en.ts index 0254e0832f..b8c0e6cd5e 100644 --- a/packages/neuron-wallet/src/locales/en.ts +++ b/packages/neuron-wallet/src/locales/en.ts @@ -92,8 +92,8 @@ export default { 'invalid-mnemonic': 'Wallet seed is invalid, please check it again.', 'unsupported-cipher': 'Unsupported cipher.', 'capacity-not-enough': 'Insufficient balance.', - 'capacity-not-enough-for-change': "You need more capacities for change (at least 61 CKBytes).", - 'capacity-not-enough-for-change-by-transfer': "You need more capacities for change (at least 61 CKBytes), or click 'Max' button to send all your balance.", + 'capacity-not-enough-for-change': "You need more capacities for change (more than 61 CKBytes).", + 'capacity-not-enough-for-change-by-transfer': "You need more capacities for change (more than 61 CKBytes), or click 'Max' button to send all your balance.", 'live-capacity-not-enough': 'Insufficient available balance, please try again when last transaction has been confirmed.', 'capacity-too-small': 'The minimal transfer balance is {{bytes}} CKBytes.', 'should-be-type-of': '{{field}} should be type of {{type}}.', diff --git a/packages/neuron-wallet/src/locales/zh-tw.ts b/packages/neuron-wallet/src/locales/zh-tw.ts index 2ff17005e3..c7d2afbffd 100644 --- a/packages/neuron-wallet/src/locales/zh-tw.ts +++ b/packages/neuron-wallet/src/locales/zh-tw.ts @@ -91,8 +91,8 @@ export default { 'invalid-mnemonic': '助記詞無效，請檢查。', 'unsupported-cipher': '不支持的 Cipher。', 'capacity-not-enough': '餘額不足。', - 'capacity-not-enough-for-change': "您需要有足够的餘額來支付找零（至少 61 CKBytes）。", - 'capacity-not-enough-for-change-by-transfer': "您需要有足够的餘額來支付找零（至少 61 CKBytes），或者點擊 'Max' 按鈕發送全部餘額。", + 'capacity-not-enough-for-change': "您需要有足够的餘額來支付找零（大于 61 CKBytes）。", + 'capacity-not-enough-for-change-by-transfer': "您需要有足够的餘額來支付找零（大于 61 CKBytes），或者點擊 'Max' 按鈕發送全部餘額。", 'live-capacity-not-enough': '可用餘額不足，請等待上一筆交易上鏈。', 'capacity-too-small': '最小轉帳金額為 {{bytes}} CKBytes。', 'should-be-type-of': '{{field}} 應該為 {{type}} 類型。', diff --git a/packages/neuron-wallet/src/locales/zh.ts b/packages/neuron-wallet/src/locales/zh.ts index 797a4b7cc2..9ed34a78e0 100644 --- a/packages/neuron-wallet/src/locales/zh.ts +++ b/packages/neuron-wallet/src/locales/zh.ts @@ -91,8 +91,8 @@ export default { 'invalid-mnemonic': '助记词不合法，请检查。', 'unsupported-cipher': '不支持的 Cipher。', 'capacity-not-enough': '余额不足。', - 'capacity-not-enough-for-change': "您需要有足够的余额来支付找零（至少 61 CKBytes）。", - 'capacity-not-enough-for-change-by-transfer': "您需要有足够的余额来支付找零（至少 61 CKBytes），或者点击 'Max' 按钮发送全部余额。", + 'capacity-not-enough-for-change': "您需要有足够的余额来支付找零（大于 61 CKBytes）。", + 'capacity-not-enough-for-change-by-transfer': "您需要有足够的余额来支付找零（大于 61 CKBytes），或者点击 'Max' 按钮发送全部余额。", 'live-capacity-not-enough': '可用余额不足，请等待上一笔交易上链。', 'capacity-too-small': '最小转账金额为 {{bytes}} CKBytes。', 'should-be-type-of': '{{field}} 应该为 {{type}} 类型。', From 6e958bb24766c245f4ca4a2f4234dac54a14b6d1 Mon Sep 17 00:00:00 2001 From: kellyshang Date: Wed, 27 Oct 2021 10:59:44 +0800 Subject: [PATCH 4/4] chore: bump version to v0.101.0 and update CHANGELOG --- CHANGELOG.md | 17 +++++++++++++++-- lerna.json | 2 +- package.json | 2 +- packages/neuron-ui/package.json | 2 +- packages/neuron-wallet/package.json | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69d0dca1c9..1fefcc72c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,22 @@ -# 0.100.2 (2021-10-15) +# 0.101.0 (2021-10-27) -[CKB v0.100.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.100.0) was released on Sep. 22nd, 2021. This version of CKB node is now bundled and preconfigured in Neuron. +[CKB v0.101.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.101.0) was released on Oct. 20th, 2021. This version of CKB node is now bundled and preconfigured in Neuron. + +**The CKB v0.101.0 activates ckb2021 since epoch 3113 in the testnet. After that nodes running this version are imcompatible with old versions. However, this version is still compatible with CKB v0.25.0 and above in the mainnet.** + +### New feature +* Upgrade the bundled CKB version and CKB-Indexer version. + +### Bug fix +* Update the hint of synchronization and warning of `capacity not enough for change`. + + +# 0.100.2 (2021-10-15) **This version is compatible with v0.100.0 and above.** +[CKB v0.100.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.100.0) was released on Sep. 22nd, 2021. This version of CKB node is now bundled and preconfigured in Neuron. + ### New feature * Add feature of destroy CKB Asset Account. diff --git a/lerna.json b/lerna.json index b6b25452a7..09ba5b3163 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.100.2", + "version": "0.101.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 149af70f76..eafc4eab2c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "neuron", "productName": "Neuron", "description": "CKB Neuron Wallet", - "version": "0.100.2", + "version": "0.101.0", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index 22cd5fd51b..a7ea3136bb 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -1,6 +1,6 @@ { "name": "neuron-ui", - "version": "0.100.2", + "version": "0.101.0", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 9a5aef1632..ca2033cef9 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -3,7 +3,7 @@ "productName": "Neuron", "description": "CKB Neuron Wallet", "homepage": "https://www.nervos.org/", - "version": "0.100.2", + "version": "0.101.0", "private": true, "author": { "name": "Nervos Core Dev", @@ -86,7 +86,7 @@ "electron-notarize": "0.2.1", "jest-when": "2.7.2", "lint-staged": "9.2.5", - "neuron-ui": "0.100.2", + "neuron-ui": "0.101.0", "rimraf": "3.0.0", "ttypescript": "1.5.10" }