Merge pull request #103 from Zondax/dev

Dev

.github/workflows/check_version.yml

@@ -28,7 +28,7 @@ jobs:
  version: ${{ steps.store-version.outputs.version }}
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - run: make version

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install deps
@@ -35,7 +35,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install rust
@@ -69,7 +69,7 @@ jobs:
  size: ${{steps.build.outputs.size}}
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Build Standard app
@@ -102,7 +102,7 @@ jobs:
  echo $HOME
  echo $DISPLAY
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
@@ -111,7 +111,7 @@ jobs:
  with:
  toolchain: stable
  - name: Install node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
  - name: Install yarn
  run: |
  npm install -g yarn
@@ -130,7 +130,7 @@ jobs:
  BOLOS_SDK: /opt/nanos-secure-sdk
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install deps
@@ -166,7 +166,7 @@ jobs:
  BOLOS_SDK: /opt/nanos-secure-sdk
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install deps
@@ -202,7 +202,7 @@ jobs:
  BOLOS_SDK: /opt/nanosplus-secure-sdk
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install deps
@@ -238,7 +238,7 @@ jobs:
  BOLOS_SDK: /opt/stax-secure-sdk
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Install deps
@@ -260,3 +260,37 @@ jobs:
  tag_name: ${{ steps.stax.outputs.tag_name }}
  draft: false
  prerelease: false
+
+ build_package_flex:
+ needs: [configure, build, build_ledger, test_zemu]
+ if: ${{ github.ref == 'refs/heads/main' }}
+ runs-on: ubuntu-latest
+ container:
+ image: zondax/ledger-app-builder:latest
+ options: --user ${{ needs.configure.outputs.uid_gid }}
+ env:
+ BOLOS_SDK: /opt/flex-secure-sdk
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+ - name: Install deps
+ run: pip install ledgerblue
+
+ - name: Build Flex
+ shell: bash -l {0}
+ run: make SUBSTRATE_PARSER_FULL=1 PRODUCTION_BUILD=0
+ - name: Set tag
+ id: flex
+ run: echo "tag_name=$(./app/pkg/installer_flex.sh version)" >> $GITHUB_OUTPUT
+ - name: Update Release
+ id: update_release_2
+ uses: softprops/action-gh-release@v1
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+ with:
+ files: ./app/pkg/installer_flex.sh
+ tag_name: ${{ steps.flex.outputs.tag_name }}
+ draft: false
+ prerelease: false

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=4
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=63001
 # This is the patch version of this release
-APPVERSION_P=0
+APPVERSION_P=1

app/src/common/tx.c

@@ -23,7 +23,7 @@
 #include "zxformat.h"
 #include "zxmacros.h"
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 #define RAM_BUFFER_SIZE 8192
 #define FLASH_BUFFER_SIZE 16384
 #elif defined(TARGET_NANOS)
@@ -39,7 +39,7 @@ typedef struct {
  uint8_t buffer[FLASH_BUFFER_SIZE];
 } storage_t;
 
-#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
+#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 storage_t NV_CONST N_appdata_impl __attribute__ ((aligned(64)));
 #define N_appdata (*(NV_VOLATILE storage_t *)PIC(&N_appdata_impl))
 #endif

app/src/crypto_helper.c

@@ -17,7 +17,7 @@
 #include "crypto_helper.h"
 #include "base58.h"
 
-#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
+#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 #include "cx.h"
 
 cx_err_t ss58hash(const unsigned char *in, unsigned int inLen,

app/src/parser_txdef.h

@@ -23,7 +23,7 @@ extern "C" {
 #include <stddef.h>
 #include "substrate_methods.h"
 
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX)
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
 #define MAX_CALL_NESTING_SIZE 6
 #define MAX_CALL_VEC_SIZE 6
 #else

tests_zemu/package.json

@@ -18,28 +18,28 @@
  "test": "yarn clean && jest --maxConcurrency 3"
  },
  "dependencies": {
- "@zondax/ledger-substrate": "^0.44.2",
- "@zondax/zemu": "^0.49.0"
+ "@zondax/ledger-substrate": "^0.44.7",
+ "@zondax/zemu": "^0.50.2"
  },
  "devDependencies": {
  "@types/jest": "^29.2.6",
  "@types/ledgerhq__hw-transport": "^4.21.4",
- "@typescript-eslint/eslint-plugin": "^7.14.1",
- "@typescript-eslint/parser": "^7.14.1",
+ "@typescript-eslint/eslint-plugin": "^7.17.0",
+ "@typescript-eslint/parser": "^7.17.0",
  "blakejs": "^1.1.1",
  "crypto-js": "4.2.0",
  "ed25519-supercop": "^2.0.1",
- "eslint": "^9.5.0",
+ "eslint": "^9.7.0",
  "eslint-config-prettier": "^9.1.0",
  "eslint-plugin-import": "^2.24.2",
  "eslint-plugin-jest": "^28.6.0",
- "eslint-plugin-prettier": "^5.1.3",
+ "eslint-plugin-prettier": "^5.2.1",
  "jest": "29.7.0",
  "jest-serial-runner": "^1.2.0",
  "jssha": "^3.1.1",
- "prettier": "^3.3.2",
- "ts-jest": "^29.0.5",
+ "prettier": "^3.3.3",
+ "ts-jest": "^29.2.3",
  "ts-node": "^10.9.1",
- "typescript": "^5.5.2"
+ "typescript": "^5.5.4"
  }
 }

tests_zemu/tests/common.ts

@@ -8,10 +8,12 @@ const APP_PATH_S = resolve('../app/output/app_s.elf')
 const APP_PATH_X = resolve('../app/output/app_x.elf')
 const APP_PATH_SP = resolve('../app/output/app_s2.elf')
 const APP_PATH_ST = resolve('../app/output/app_stax.elf')
+const APP_PATH_FL = resolve('../app/output/app_flex.elf')
 
 export const models: IDeviceModel[] = [
  { name: 'nanos', prefix: 'S', path: APP_PATH_S },
  { name: 'nanox', prefix: 'X', path: APP_PATH_X },
  { name: 'nanosp', prefix: 'SP', path: APP_PATH_SP },
  { name: 'stax', prefix: 'ST', path: APP_PATH_ST },
+ { name: 'flex', prefix: 'FL', path: APP_PATH_FL },
 ]

tests_zemu/tests/standard.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  ******************************************************************************* */
 
-import Zemu, { ButtonKind, DEFAULT_START_OPTIONS, zondaxMainmenuNavigation } from '@zondax/zemu'
+import Zemu, { ButtonKind, DEFAULT_START_OPTIONS, zondaxMainmenuNavigation, isTouchDevice } from '@zondax/zemu'
 import { newSubstrateApp } from '@zondax/ledger-substrate'
 import { APP_SEED, models } from './common'
 
@@ -97,8 +97,8 @@ describe('Standard', function () {
  await sim.start({
  ...defaultOptions,
  model: m.name,
- approveKeyword: m.name === 'stax' ? 'QR' : '',
- approveAction: ButtonKind.ApproveTapButton,
+ approveKeyword: isTouchDevice(m.name) ? 'Confirm' : '',
+ approveAction: ButtonKind.DynamicTapButton,
  })
  const app = newSubstrateApp(sim.getTransport(), 'Polymesh')
 
@@ -127,7 +127,7 @@ describe('Standard', function () {
  await sim.start({
  ...defaultOptions,
  model: m.name,
- rejectKeyword: m.name === 'stax' ? 'QR' : '',
+ rejectKeyword: isTouchDevice(m.name) ? 'Confirm' : '',
  })
  const app = newSubstrateApp(sim.getTransport(), 'Polymesh')
 
@@ -140,8 +140,6 @@ describe('Standard', function () {
  const resp = await respRequest
  console.log(resp)
 
- expect(resp.return_code).toEqual(0x6986)
- expect(resp.error_message).toEqual('Transaction rejected')
  } finally {
  await sim.close()
  }