From cd474f1858fdb089f8c5cdae7ffabd6e97a470d4 Mon Sep 17 00:00:00 2001 From: mroz Date: Tue, 29 Mar 2022 16:07:34 +0200 Subject: [PATCH] chore: move submodules to root --- .gitmodules | 6 ++-- .prettierignore | 2 +- package.json | 2 ++ packages/transport/package.json | 4 +-- packages/transport/scripts/protobuf-build.sh | 2 +- packages/transport/scripts/protobuf-types.js | 2 +- packages/transport/src/index.ts | 1 + .../src/{types.ts => types/index.ts} | 2 ++ .../{protobuf.d.ts => src/types/messages.ts} | 0 scripts/update-coins.sh | 31 +++++++++++++++++++ .../scripts => scripts}/update-submodules.sh | 3 +- .../transport => submodules}/trezor-common | 0 12 files changed, 45 insertions(+), 10 deletions(-) rename packages/transport/src/{types.ts => types/index.ts} (97%) rename packages/transport/{protobuf.d.ts => src/types/messages.ts} (100%) create mode 100755 scripts/update-coins.sh rename {packages/transport/scripts => scripts}/update-submodules.sh (87%) rename {packages/transport => submodules}/trezor-common (100%) diff --git a/.gitmodules b/.gitmodules index f43fee73de..39cc0d8df3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "packages/transport/trezor-common"] - path = packages/transport/trezor-common - url = https://github.com/trezor/trezor-common.git +[submodule "submodules/trezor-common"] + path = submodules/trezor-common + url = https://github.com/trezor/trezor-common diff --git a/.prettierignore b/.prettierignore index 4970d8f56d..40b6794572 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,6 @@ ### custom prettier ignore config ### -packages/transport/trezor-common +submodules ### copy paste of .gitignore ### diff --git a/package.json b/package.json index 3e9d6f044d..49878e1377 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,8 @@ "msg-system-sign-config": "yarn workspace @trezor/suite-data msg-system-sign-config", "format": "yarn prettier --write \"**/*.{js,ts,tsx,mdx,md,html,json}\"", "format:verify": "yarn prettier --check \"**/*.{js,ts,tsx,mdx,md,html,json}\"", + "update-submodules": "./scripts/update-submodules.sh", + "update-coins": "./scripts/update-coins.sh", "_______ Aliases _______": "Aliases for longer commands which we often have to run manually. Names don't have to be pretty or make total sense.", "refs": "yarn update-project-references", "types": "yarn type-check", diff --git a/packages/transport/package.json b/packages/transport/package.json index e9455cd2a1..b0e58a86bc 100644 --- a/packages/transport/package.json +++ b/packages/transport/package.json @@ -21,8 +21,7 @@ "scripts/protobuf-build.sh", "scripts/protobuf-patches", "scripts/protobuf-types.js", - "messages.json", - "protobuf.d.ts" + "messages.json" ], "scripts": { "lint": "eslint '**/*.{ts,tsx,js}'", @@ -31,7 +30,6 @@ "publish:lib": "./scripts/publish-lib.sh", "test:unit": "jest", "example:bridge": "jest --verbose -c jest.config.e2e.js --testPathPattern bridge.integration", - "update:submodules": "./scripts/update-submodules.sh", "update:protobuf": "./scripts/protobuf-build.sh" }, "devDependencies": { diff --git a/packages/transport/scripts/protobuf-build.sh b/packages/transport/scripts/protobuf-build.sh index 096194c362..49dd2d7495 100755 --- a/packages/transport/scripts/protobuf-build.sh +++ b/packages/transport/scripts/protobuf-build.sh @@ -6,7 +6,7 @@ echo $# PARENT_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) -SRC="trezor-common/protob" +SRC="../../submodules/trezor-common/protob" DIST="." LANG="typescript" diff --git a/packages/transport/scripts/protobuf-types.js b/packages/transport/scripts/protobuf-types.js index e2021b262b..bb8c0bca0d 100644 --- a/packages/transport/scripts/protobuf-types.js +++ b/packages/transport/scripts/protobuf-types.js @@ -253,7 +253,7 @@ export type TypedCall = ( // save to file const filePath = isTypescript - ? path.join(__dirname, '../protobuf.d.ts') + ? path.join(__dirname, '../src/types/messages.ts') : path.join(__dirname, '../protobuf.js'); fs.writeFile(filePath, lines.join('\n'), err => { if (err) return console.log(err); diff --git a/packages/transport/src/index.ts b/packages/transport/src/index.ts index 9d1e7eb70e..c5906d4004 100644 --- a/packages/transport/src/index.ts +++ b/packages/transport/src/index.ts @@ -19,6 +19,7 @@ export type { AcquireInput, TrezorDeviceInfoWithSession, MessageFromTrezor, + Messages, } from './types'; export default { diff --git a/packages/transport/src/types.ts b/packages/transport/src/types/index.ts similarity index 97% rename from packages/transport/src/types.ts rename to packages/transport/src/types/index.ts index f24002e707..7bfc4b6fd0 100644 --- a/packages/transport/src/types.ts +++ b/packages/transport/src/types/index.ts @@ -1,3 +1,5 @@ +export * as Messages from './messages'; + // does not have session export type TrezorDeviceInfo = { path: string; diff --git a/packages/transport/protobuf.d.ts b/packages/transport/src/types/messages.ts similarity index 100% rename from packages/transport/protobuf.d.ts rename to packages/transport/src/types/messages.ts diff --git a/scripts/update-coins.sh b/scripts/update-coins.sh new file mode 100755 index 0000000000..56ccd772ec --- /dev/null +++ b/scripts/update-coins.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +set -euxo pipefail + +SRC='./submodules/trezor-common/tools' +DIST='./packages/connect-common/files' + +# todo: +# if [ $# -ge 1 ] && [ "$1" == "local" ] +# then +# SRC='../trezor-firmware/common/tools' +# fi + +# BUID coins.json using tezor-common cointool +# exlude unused fields +$SRC/cointool.py dump -p -d connect -o $DIST/coins.json \ + -e blockbook \ + -e icon \ + -e cooldown \ + -e github \ + -e key \ + -e maintainer \ + -e uri_prefix \ + -e version_group_id \ + -e website \ + -e links \ + -e duplicate \ + -e wallet \ + -e bitcore \ + -e confidential_assets \ + -e negative_fee \ diff --git a/packages/transport/scripts/update-submodules.sh b/scripts/update-submodules.sh similarity index 87% rename from packages/transport/scripts/update-submodules.sh rename to scripts/update-submodules.sh index 7356b4df87..92eb08a267 100755 --- a/packages/transport/scripts/update-submodules.sh +++ b/scripts/update-submodules.sh @@ -4,9 +4,10 @@ set -euxo pipefail PARENT_PATH=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) cd "$PARENT_PATH" -cd ../trezor-common +cd ../submodules/trezor-common commit=$(git rev-parse --short HEAD) echo $commit git pull origin master +cd ../ git add . git commit -m "chore: update trezor-common ($commit)" diff --git a/packages/transport/trezor-common b/submodules/trezor-common similarity index 100% rename from packages/transport/trezor-common rename to submodules/trezor-common