Skip to content

Commit

Permalink
Merge branch 'onekey' into feat/adaConway
Browse files Browse the repository at this point in the history
  • Loading branch information
@ByteZhang1024
ByteZhang1024 authored Oct 15, 2024
2 parents ec6d810 + 237c606 commit 42f0292
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 43 deletions.
2 changes: 1 addition & 1 deletion packages/connect-examples/electron-example/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hardware-example",
"productName": "HardwareExample",
"executableName": "onekey-hardware-example",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"author": "OneKey",
"description": "End-to-end encrypted workspaces for teams",
"main": "dist/index.js",
Expand Down
10 changes: 5 additions & 5 deletions packages/connect-examples/expo-example/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expo-example",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"scripts": {
"start": "CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
"android": "yarn expo run:android",
Expand All @@ -19,10 +19,10 @@
"@noble/ed25519": "^2.1.0",
"@noble/hashes": "^1.3.3",
"@noble/secp256k1": "^1.7.1",
"@onekeyfe/hd-ble-sdk": "^1.0.12-alpha.1",
"@onekeyfe/hd-common-connect-sdk": "^1.0.12-alpha.1",
"@onekeyfe/hd-core": "^1.0.12-alpha.1",
"@onekeyfe/hd-web-sdk": "^1.0.12-alpha.1",
"@onekeyfe/hd-ble-sdk": "^1.0.12-alpha.2",
"@onekeyfe/hd-common-connect-sdk": "^1.0.12-alpha.2",
"@onekeyfe/hd-core": "^1.0.12-alpha.2",
"@onekeyfe/hd-web-sdk": "^1.0.12-alpha.2",
"@onekeyfe/react-native-ble-plx": "3.0.0",
"@polkadot/util-crypto": "13.1.1",
"@react-native-async-storage/async-storage": "1.21.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/connect-examples/expo-example/src/constants/connect.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { version } from '../../package.json';

export const CONNECT_SRC = process.env.CONNECT_SRC || `https://jssdk.onekey.so/${version}`;
export const CONNECT_SRC = process.env.CONNECT_SRC || `https://jssdk.onekey.so/${version}/`;
3 changes: 3 additions & 0 deletions packages/connect-examples/expo-example/src/data/alephium.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const api: PlaygroundProps[] = [
title: 'Get address',
value: {
path: "m/44'/1234'/0'/0/0",
includePublicKey: true,
showOnOneKey: false,
group: 0,
},
Expand All @@ -19,11 +20,13 @@ const api: PlaygroundProps[] = [
bundle: [
{
path: "m/44'/1234'/0'/0/0",
includePublicKey: true,
showOnOneKey: false,
group: 0,
},
{
path: "m/44'/1234'/0'/0/1",
includePublicKey: true,
showOnOneKey: false,
group: 0,
},
Expand Down
2 changes: 2 additions & 0 deletions packages/connect-examples/expo-example/src/data/allnetwork.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ const api: PlaygroundProps[] = [
{
network: 'alph',
path: "m/44'/1234'/0'/0/0",
includePublicKey: true,
showOnOneKey: false,
group: 0,
},
{
network: 'nostr',
Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-core",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"description": "> TODO: description",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -25,8 +25,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport": "^1.0.12-alpha.2",
"axios": "^0.27.2",
"bignumber.js": "^9.0.2",
"bytebuffer": "^5.0.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/api/alephium/AlephiumGetAddress.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export default class AlephiumGetAddress extends BaseMethod<HardwareAlephiumGetAd
address_n: addressN,
show_display: showOnOneKey,
include_public_key: batch.includePublicKey ?? false,
target_group: batch.group,
// When group is 'null', the 'group' parameter will not be sent
...(batch.group !== null && { target_group: batch.group ?? 0 }),
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/types/api/alephiumGetAddress.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export type AlephiumGetAddressParams = {
path: string | number[];
showOnOneKey?: boolean;
includePublicKey?: boolean;
group: number;
group: number | undefined | null;
};

export declare function alephiumGetAddress(
Expand Down
8 changes: 4 additions & 4 deletions packages/hd-ble-sdk/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-ble-sdk",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,8 +20,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-react-native": "^1.0.12-alpha.1"
"@onekeyfe/hd-core": "^1.0.12-alpha.2",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-react-native": "^1.0.12-alpha.2"
}
}
12 changes: 6 additions & 6 deletions packages/hd-common-connect-sdk/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-common-connect-sdk",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -20,10 +20,10 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-core": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-http": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-lowlevel": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.1"
"@onekeyfe/hd-core": "^1.0.12-alpha.2",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-http": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-lowlevel": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.2"
}
}
6 changes: 3 additions & 3 deletions packages/hd-transport-http/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-http",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"description": "hardware http transport",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand All @@ -24,8 +24,8 @@
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
},
"dependencies": {
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport": "^1.0.12-alpha.2",
"axios": "^0.27.2"
}
}
6 changes: 3 additions & 3 deletions packages/hd-transport-lowlevel/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-lowlevel",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,7 +19,7 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport": "^1.0.12-alpha.1"
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport": "^1.0.12-alpha.2"
}
}
6 changes: 3 additions & 3 deletions packages/hd-transport-react-native/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-react-native",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
"main": "dist/index.js",
Expand All @@ -19,8 +19,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport": "^1.0.12-alpha.2",
"@onekeyfe/react-native-ble-plx": "3.0.1",
"react-native-ble-manager": "^8.1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/hd-transport-webusb/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport-webusb",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "MIT",
Expand All @@ -20,8 +20,8 @@
"lint:fix": "eslint . --fix"
},
"dependencies": {
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport": "^1.0.12-alpha.1"
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport": "^1.0.12-alpha.2"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.6"
Expand Down
2 changes: 1 addition & 1 deletion packages/hd-transport/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-transport",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"description": "> TODO: description",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
Expand Down
10 changes: 5 additions & 5 deletions packages/hd-web-sdk/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-web-sdk",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"author": "OneKey",
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
"license": "ISC",
Expand All @@ -21,10 +21,10 @@
},
"dependencies": {
"@onekeyfe/cross-inpage-provider-core": "^0.0.17",
"@onekeyfe/hd-core": "^1.0.12-alpha.1",
"@onekeyfe/hd-shared": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-http": "^1.0.12-alpha.1",
"@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.1"
"@onekeyfe/hd-core": "^1.0.12-alpha.2",
"@onekeyfe/hd-shared": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-http": "^1.0.12-alpha.2",
"@onekeyfe/hd-transport-webusb": "^1.0.12-alpha.2"
},
"devDependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.17.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/hd-web-sdk/src/iframe/builder.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export const init = async (settings: any) => {
}
}

const manifest = `version=${settings.version as string}`;
const src = `${settings.iframeSrc as string}?${manifest}`;
// const manifest = `version=${settings.version as string}`;
const src = `${settings.iframeSrc as string}`;

instance.setAttribute('src', src);

Expand Down
2 changes: 1 addition & 1 deletion packages/shared/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@onekeyfe/hd-shared",
"version": "1.0.12-alpha.1",
"version": "1.0.12-alpha.2",
"description": "Hardware SDK's shared tool library",
"keywords": [
"Hardware-SDK",
Expand Down

0 comments on commit 42f0292

Please sign in to comment.