Merge pull request #2552 from nervosnetwork/rc/v0.103.3

nervosnetwork · Dec 21, 2022 · 454ba8f · 454ba8f · github-actions · Dec 21, 2022
2 parents bc8e13a + 4275a3d
commit 454ba8f
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 18 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -14,7 +14,7 @@ jobs:
         node:
           - 16.10.0
         os:
-          - macos-latest
+          - macos-11
           - ubuntu-20.04
           - windows-2019
 
@@ -43,7 +43,7 @@ jobs:
           path: |
             node_modules
             */*/node_modules
-          key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
+          key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
       - name: Add msbuild to PATH
         if: matrix.os == 'windows-2019'
@@ -67,7 +67,7 @@ jobs:
           CI: false
 
       - name: Package for MacOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         run: |
           ./scripts/download-ckb.sh mac
           yarn release mac
@@ -99,14 +99,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Neuron App Zip
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Mac
           path: release/Neuron-*-mac.zip
 
       - name: Upload Neuron Dmg
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Dmg

diff --git a/.github/workflows/package_for_test.yml b/.github/workflows/package_for_test.yml
@@ -9,7 +9,7 @@ jobs:
         node:
           - 16.10.0
         os:
-          - macos-latest
+          - macos-11
           - ubuntu-20.04
           - windows-2019
 
@@ -38,7 +38,7 @@ jobs:
           path: |
             node_modules
             */*/node_modules
-          key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
+          key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
 
       - name: Add msbuild to PATH
         if: matrix.os == 'windows-2019'
@@ -62,7 +62,7 @@ jobs:
           CI: false
 
       - name: Package for MacOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         run: |
           ./scripts/download-ckb.sh mac
           yarn package:test mac
@@ -94,14 +94,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload Neuron App Zip
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Mac
           path: release/Neuron-*-mac.zip
 
       - name: Upload Neuron Dmg
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         uses: actions/upload-artifact@v2
         with:
           name: Neuron-Dmg

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 0.103.3 (2022-12-21)
+
+### Certificate
+
+We've updated the certificate of Neuron for windows, which is issued by **DigiCert** and distributed to [Magickbase](https://github.com/Magickbase/), the active developer team of Neuron. With this update, a warning may appear on updating Neuron by `check for update` inside Neuron, please don't worry and download Neuron from [GitHub Release](https://github.com/nervosnetwork/neuron/releases) to adopt the new certificate.
+
+### Bug Fixes
+
+* #2551: Fix sending multisig tx when input cell's length is greater than 1.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.103.2...v0.103.3
+
+
+
 # 0.103.2 (2022-07-09)
 
 ### New features

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.103.2",
+  "version": "0.103.3",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.103.2",
+  "version": "0.103.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

diff --git a/packages/neuron-ui/src/components/PasswordRequest/index.tsx b/packages/neuron-ui/src/components/PasswordRequest/index.tsx
@@ -25,6 +25,7 @@ import {
   OfflineSignType,
   signAndExportTransaction,
   requestOpenInExplorer,
+  invokeShowErrorMessage,
 } from 'services/remote'
 import { PasswordIncorrectException } from 'exceptions'
 import DropdownButton from 'widgets/DropdownButton'
@@ -152,11 +153,16 @@ const PasswordRequest = () => {
               break
             }
             await sendTransaction({ walletID, tx: generatedTx, description, password, multisigConfig })(dispatch).then(
-              (res: { result: string; status: number }) => {
+              (res: { result: string; status: number; message: string | { content: string } }) => {
                 if (isSuccessResponse(res)) {
                   requestOpenInExplorer({ type: 'transaction', key: res.result })
                 } else if (res.status === ErrorCode.PasswordIncorrect) {
                   throw new PasswordIncorrectException()
+                } else {
+                  invokeShowErrorMessage({
+                    title: t('messages.error'),
+                    content: typeof res.message === 'string' ? res.message : res.message.content!,
+                  })
                 }
               }
             )

diff --git 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.103.2",
+  "version": "0.103.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -91,7 +91,7 @@
     "eslint-plugin-prettier": "3.1.1",
     "jest-when": "2.7.2",
     "lint-staged": "9.2.5",
-    "neuron-ui": "0.103.2",
+    "neuron-ui": "0.103.3",
     "prettier": "1.19.1",
     "rimraf": "3.0.0",
     "ttypescript": "1.5.10",

diff --git a/packages/neuron-wallet/src/services/transaction-sender.ts b/packages/neuron-wallet/src/services/transaction-sender.ts
@@ -293,9 +293,6 @@ export default class TransactionSender {
       const lockArgs: string = input.lock!.args!
       const wit: WitnessArgs | string = tx.witnesses[index]
       const witnessArgs: WitnessArgs = wit instanceof WitnessArgs ? wit : WitnessArgs.generateEmpty()
-      if (typeof wit === 'string' && wit.length) {
-        witnessArgs.lock = wit
-      }
       return {
         witnessArgs,
         lockHash: input.lockHash!,

diff --git a/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-sender.test.ts
@@ -983,6 +983,47 @@ describe('TransactionSender Test', () => {
           expect(res.witnesses[0]).toBe(expectedValue)
         })
       })
+
+      it(`input cell's length is 2`, async() => {
+        const addresses = [
+          'ckt1qyq89x5ggpt0a5epm2k2gyxeffwkgfdxeg0s543mh4',
+          'ckt1qyqql0vgjyxjxjxknkj6nq8jxa485xsyl66sy7c5f6'
+        ]
+        const [multiArgs, multisigConfig] = createMultisigConfig(1, 1, addresses)
+        const addr = {
+          walletId: fakeWallet.id,
+          path: `m/44'/309'/0'/0/0`,
+          blake160: addressToScript(addresses[0]).args,
+          version: 'testnet'
+        }
+
+        const mockGAI = jest.fn()
+        mockGAI.mockReturnValueOnce([addr])
+        transactionSender.getAddressInfos = mockGAI.bind(transactionSender)
+        const tx = Transaction.fromObject(transcationObject)
+        tx.inputs[0]!.setLock(SystemScriptInfo.generateMultiSignScript(multiArgs))
+        tx.inputs.push(
+          Input.fromObject({
+            previousOutput: OutPoint.fromObject({
+              txHash: '0x1879851943fa686af29bed5c95acd566d0244e7b3ca89cf7c435622a5a5b4cb3',
+              index: '0x0'
+            }),
+            since: '0x0',
+            lock: Script.fromObject({
+              args: multiArgs,
+              codeHash: SystemScriptInfo.MULTI_SIGN_CODE_HASH,
+              hashType: SystemScriptInfo.MULTI_SIGN_HASH_TYPE
+            })
+          })
+        )
+        tx.witnesses = ['0x', '0x']
+        const res = await transactionSender.signMultisig(fakeWallet.id, tx, '1234', [multisigConfig])
+        expect(res.witnesses).toHaveLength(2)
+        expect(res.witnesses[1]).toBe('0x')
+        expect(res.witnesses[0]).toBe(
+          '0x810000001000000081000000810000006d00000000010102729a884056fed321daaca410d94a5d6425a6ca1f0fbd88910d2348d69da5a980f2376a7a1a04feb595163e5edf15f297453a64f3248c69823afcfdaabc6771b088e4f6250e2e2f91136f5c6a9cbf49a79d955644d7381481f3c5c8ab93bcc52a71de4b072e0697c001'
+        )
+      })
     })
   })
 })