Skip to content

Rc/v0.1.0 alpha.5 (#33) #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zmcNotafraid wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Rc/v0.1.0 alpha.5 (#33) #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Package Keypering

on:
workflow_run:
workflows:
workflows:
- Tests
branches:
branches:
- master
- develop
- 'rc/**'
types:
types:
- completed

jobs:
Expand Down Expand Up @@ -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
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Upload Artifacts to Release

on:
workflow_run:
workflows:
workflows:
- Tests
branches:
branches:
- master
types:
types:
- completed

jobs:
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.1.0-alpha.4"
"version": "0.1.0-alpha.5"
}
12 changes: 12 additions & 0 deletions packages/app/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
0 packages/app/assets/entitlement.plist → packages/app/assets/entitlements.mac.plist
View file
Open in desktop
File renamed without changes.
12 changes: 9 additions & 3 deletions packages/app/electron-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ directories:
buildResources: .
output: ../../release

dmg:
sign: false
artifactName: "${productName}-v${version}.${ext}"

files:
- package.json
- from: build
Expand Down Expand Up @@ -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}'
Expand Down
4 changes: 2 additions & 2 deletions packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keypering/app",
"version": "0.1.0-alpha.4",
"version": "0.1.0-alpha.5",
"description": "",
"author": "Keith <keithwhisper@gmail.com>",
"homepage": "https://nervosnetwork.github.io/keypering",
Expand Down Expand Up @@ -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",
Expand Down
16 changes: 14 additions & 2 deletions packages/app/src/setting/scripts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [
Expand All @@ -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[] = [
Expand All @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/utils/const.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 8 additions & 0 deletions packages/specs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
2 changes: 1 addition & 1 deletion packages/specs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keypering/specs",
"version": "0.1.0-alpha.4",
"version": "0.1.0-alpha.5",
"description": "",
"author": "Keith <keithwhisper@gmail.com>",
"homepage": "https://nervosnetwork.github.io/keypering/#/protocol",
Expand Down
8 changes: 8 additions & 0 deletions packages/ui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@keypering/ui",
"version": "0.1.0-alpha.4",
"version": "0.1.0-alpha.5",
"private": true,
"homepage": ".",
"scripts": {
Expand Down Expand Up @@ -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",
Expand Down