From 960d6bd8f9a51a047726b4e3cf91da6bd0095b63 Mon Sep 17 00:00:00 2001 From: Miles Zhang Date: Wed, 30 Dec 2020 14:05:55 +0800 Subject: [PATCH] Rc/v0.1.0 alpha.5 (#33) * feat: return networkId after auth * doc: add networkId to auth response * feat: Add mainnet ACP deps info and update testnet acp info * chore: sign macOS in CI * chore: pre release v0.1.0-alpha.5 --- .github/workflows/package.yml | 22 +++++++++++++++---- .github/workflows/release.yml | 22 +++++++++++++++---- CHANGELOG.md | 12 ++++++++++ lerna.json | 2 +- packages/app/CHANGELOG.md | 12 ++++++++++ ...titlement.plist => entitlements.mac.plist} | 0 packages/app/electron-builder.yml | 12 +++++++--- packages/app/package.json | 4 ++-- packages/app/src/setting/scripts.ts | 16 ++++++++++++-- packages/app/src/utils/const.ts | 6 +++-- packages/specs/CHANGELOG.md | 8 +++++++ packages/specs/package.json | 2 +- packages/ui/CHANGELOG.md | 8 +++++++ packages/ui/package.json | 4 ++-- 14 files changed, 109 insertions(+), 21 deletions(-) rename packages/app/assets/{entitlement.plist => entitlements.mac.plist} (100%) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index dda3be7..e237968 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -2,13 +2,13 @@ name: Package Keypering on: workflow_run: - workflows: + workflows: - Tests - branches: + branches: - master - develop - 'rc/**' - types: + types: - completed jobs: @@ -36,18 +36,32 @@ jobs: - name: Build Specs run: npm run build:specs + - name: Import Code-Signing Certificates + uses: Apple-Actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.MAC_CERTIFICATE_BASE64 }} + p12-password: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} + - name: Package run: | echo PORT=3102 > ./packages/app/.env npm run release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CSC_LINK: ${{ secrets.MAC_CERTIFICATE_BASE64 }} + CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} - name: Upload Keypering Mac uses: actions/upload-artifact@v2 with: name: Keypering-Mac - path: release/Keypering-*-mac.zip + path: release/Keypering-*-mac.7z + + - name: Upload Keypering Dmg + uses: actions/upload-artifact@v2 + with: + name: Keypering-Dmg + path: release/Keypering-*.dmg - name: Upload Keypering Win uses: actions/upload-artifact@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d1e357..2bfc8c4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,11 +2,11 @@ name: Upload Artifacts to Release on: workflow_run: - workflows: + workflows: - Tests - branches: + branches: - master - types: + types: - completed jobs: @@ -36,18 +36,32 @@ jobs: - name: Build Specs run: npm run build:specs + - name: Import Code-Signing Certificates + uses: Apple-Actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.MAC_CERTIFICATE_BASE64 }} + p12-password: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} + - name: Package run: | echo PORT=3102 > ./packages/app/.env npm run release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CSC_LINK: ${{ secrets.MAC_CERTIFICATE_BASE64 }} + CSC_KEY_PASSWORD: ${{ secrets.MAC_CERTIFICATE_PASSWORD }} - name: Upload Keypering Mac uses: actions/upload-artifact@v2 with: name: Keypering-Mac - path: release/Keypering-*-mac.zip + path: release/Keypering-*-mac.7z + + - name: Upload Keypering Dmg + uses: actions/upload-artifact@v2 + with: + name: Keypering-Dmg + path: release/Keypering-*.dmg - name: Upload Keypering Win uses: actions/upload-artifact@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 35d7073..689a3aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.1.0-alpha.5](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.4...v0.1.0-alpha.5) (2020-12-30) + + +### Features + +* Add mainnet ACP deps info and update testnet acp info ([6cb3c20](https://github.com/nervosnetwork/keypering/commit/6cb3c204e42bf131fa88415cc7cb87a5fcc8bf31)) +* return networkId after auth ([b43c230](https://github.com/nervosnetwork/keypering/commit/b43c2305f3dc9d42e5b018a988105b0601acd43f)) + + + + + # [0.1.0-alpha.4](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.2...v0.1.0-alpha.4) (2020-12-21) diff --git a/lerna.json b/lerna.json index 41b0fda..4a284b9 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "0.1.0-alpha.4" + "version": "0.1.0-alpha.5" } diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md index 7205f39..24b1670 100644 --- a/packages/app/CHANGELOG.md +++ b/packages/app/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.1.0-alpha.5](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.4...v0.1.0-alpha.5) (2020-12-30) + + +### Features + +* Add mainnet ACP deps info and update testnet acp info ([6cb3c20](https://github.com/nervosnetwork/keypering/commit/6cb3c204e42bf131fa88415cc7cb87a5fcc8bf31)) +* return networkId after auth ([b43c230](https://github.com/nervosnetwork/keypering/commit/b43c2305f3dc9d42e5b018a988105b0601acd43f)) + + + + + # [0.1.0-alpha.4](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.2...v0.1.0-alpha.4) (2020-12-21) diff --git a/packages/app/assets/entitlement.plist b/packages/app/assets/entitlements.mac.plist similarity index 100% rename from packages/app/assets/entitlement.plist rename to packages/app/assets/entitlements.mac.plist diff --git a/packages/app/electron-builder.yml b/packages/app/electron-builder.yml index ceb83c8..1fc5af8 100644 --- a/packages/app/electron-builder.yml +++ b/packages/app/electron-builder.yml @@ -8,6 +8,10 @@ directories: buildResources: . output: ../../release +dmg: + sign: false + artifactName: "${productName}-v${version}.${ext}" + files: - package.json - from: build @@ -48,10 +52,12 @@ mac: icon: assets/icons/icon.icns hardenedRuntime: true gatekeeperAssess: false - entitlements: assets/entitlements.plist - entitlementsInherit: assets/entitlements.plist + entitlements: assets/entitlements.mac.plist + entitlementsInherit: assets/entitlements.mac.plist electronLanguages: ['en'] - target: [zip] + target: + - 7z + - dmg linux: artifactName: '${productName}-v${version}-${arch}.${ext}' diff --git a/packages/app/package.json b/packages/app/package.json index a745c87..8f016e2 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,6 +1,6 @@ { "name": "@keypering/app", - "version": "0.1.0-alpha.4", + "version": "0.1.0-alpha.5", "description": "", "author": "Keith ", "homepage": "https://nervosnetwork.github.io/keypering", @@ -32,7 +32,7 @@ "url": "https://github.com/nervosnetwork/keypering/issues" }, "devDependencies": { - "@keypering/specs": "0.1.0-alpha.4", + "@keypering/specs": "0.1.0-alpha.5", "@types/elliptic": "6.4.12", "@types/uuid": "8.0.1", "electron": "9.2.0", diff --git a/packages/app/src/setting/scripts.ts b/packages/app/src/setting/scripts.ts index 1418e36..e762f67 100644 --- a/packages/app/src/setting/scripts.ts +++ b/packages/app/src/setting/scripts.ts @@ -6,8 +6,10 @@ import { SECP256K1_BLAKE160_DEVNET_TX_HASH, SECP256K1_BLAKE160_MAINNET_TX_HASH, SECP256K1_BLAKE160_TESTNET_TX_HASH, - ANYONE_CAN_PAY_CODE_HASH, ANYONE_CAN_PAY_TESTNET_TX_HASH, + ANYONE_CAN_PAY_MAINNET_CODE_HASH, + ANYONE_CAN_PAY_MAINNET_TX_HASH, + ANYONE_CAN_PAY_TESTNET_CODE_HASH, } from '../utils' const mainnetScripts: LockScript[] = [ @@ -20,6 +22,16 @@ const mainnetScripts: LockScript[] = [ depType: 'depGroup', }, ]), + new AnyPayLockScript(ANYONE_CAN_PAY_MAINNET_CODE_HASH, 'type', [ + { + outPoint: { + txHash: ANYONE_CAN_PAY_MAINNET_TX_HASH, + index: '0x0', + }, + depType: 'depGroup', + }, + ]), + ] const testnetScripts: LockScript[] = [ @@ -33,7 +45,7 @@ const testnetScripts: LockScript[] = [ }, ]), - new AnyPayLockScript(ANYONE_CAN_PAY_CODE_HASH, 'type', [ + new AnyPayLockScript(ANYONE_CAN_PAY_TESTNET_CODE_HASH, 'type', [ { outPoint: { txHash: ANYONE_CAN_PAY_TESTNET_TX_HASH, diff --git a/packages/app/src/utils/const.ts b/packages/app/src/utils/const.ts index 99f3e6e..f613f25 100644 --- a/packages/app/src/utils/const.ts +++ b/packages/app/src/utils/const.ts @@ -3,8 +3,10 @@ export const MAINNET_ID = 'ckb' export const TESTNET_ID = 'ckb_test' export const DEVNET_ID = 'ckb_dev' -export const ANYONE_CAN_PAY_CODE_HASH = '0x86a1c6987a4acbe1a887cca4c9dd2ac9fcb07405bbeda51b861b18bbf7492c4b' -export const ANYONE_CAN_PAY_TESTNET_TX_HASH = '0x4f32b3e39bd1b6350d326fdfafdfe05e5221865c3098ae323096f0bfc69e0a8c' +export const ANYONE_CAN_PAY_MAINNET_CODE_HASH = '0xd369597ff47f29fbc0d47d2e3775370d1250b85140c670e4718af712983a2354' +export const ANYONE_CAN_PAY_MAINNET_TX_HASH = '0x4153a2014952d7cac45f285ce9a7c5c0c0e1b21f2d378b82ac1433cb11c25c4d' +export const ANYONE_CAN_PAY_TESTNET_CODE_HASH = '0x3419a1c09eb2567f6552ee7a8ecffd64155cffe0f1796e6e61ec088d740c1356' +export const ANYONE_CAN_PAY_TESTNET_TX_HASH = '0xec26b0f85ed839ece5f11c4c4e837ec359f5adc4420410f6453b1f6b60fb96a6' export const SECP256K1_BLAKE160_CODE_HASH = '0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8' export const SECP256K1_BLAKE160_TESTNET_TX_HASH = '0xf8de3bb47d055cdf460d93a2a6e1b05f7432f9777c8c474abf4eec1d4aee5d37' diff --git a/packages/specs/CHANGELOG.md b/packages/specs/CHANGELOG.md index 48f7136..a4b9f52 100644 --- a/packages/specs/CHANGELOG.md +++ b/packages/specs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.1.0-alpha.5](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.4...v0.1.0-alpha.5) (2020-12-30) + +**Note:** Version bump only for package @keypering/specs + + + + + # [0.1.0-alpha.4](https://github.com/nervosnetwork/keypering/compare/v0.1.0-alpha.2...v0.1.0-alpha.4) (2020-12-21) diff --git a/packages/specs/package.json b/packages/specs/package.json index 969ca2a..85693a0 100644 --- a/packages/specs/package.json +++ b/packages/specs/package.json @@ -1,6 +1,6 @@ { "name": "@keypering/specs", - "version": "0.1.0-alpha.4", + "version": "0.1.0-alpha.5", "description": "", "author": "Keith ", "homepage": "https://nervosnetwork.github.io/keypering/#/protocol", diff --git a/packages/ui/CHANGELOG.md b/packages/ui/CHANGELOG.md index 7125099..0ef1ab2 100644 --- a/packages/ui/CHANGELOG.md +++ b/packages/ui/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [0.1.0-alpha.5](https://github.com/zmcNotafraid/keypering/compare/v0.1.0-alpha.4...v0.1.0-alpha.5) (2020-12-30) + +**Note:** Version bump only for package @keypering/ui + + + + + # [0.1.0-alpha.4](https://github.com/zmcNotafraid/keypering/compare/v0.1.0-alpha.2...v0.1.0-alpha.4) (2020-12-21) **Note:** Version bump only for package @keypering/ui diff --git a/packages/ui/package.json b/packages/ui/package.json index c3f76d8..fd5ab26 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@keypering/ui", - "version": "0.1.0-alpha.4", + "version": "0.1.0-alpha.5", "private": true, "homepage": ".", "scripts": { @@ -29,7 +29,7 @@ "react-scripts": "3.4.1" }, "devDependencies": { - "@keypering/specs": "0.1.0-alpha.4", + "@keypering/specs": "0.1.0-alpha.5", "@nervosnetwork/ckb-types": "0.34.0", "@types/react": "16.9.45", "@types/react-dom": "16.9.0",