Skip to content
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.

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

Bump containers, update issues #35

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.9.0

steps:
- name: Clone
Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.9.0

steps:
- name: Clone
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.9.0

steps:
- name: Clone
Expand All @@ -72,7 +72,7 @@ jobs:
needs: job_nanoS_build_debug

container:
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.9.0

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion MakefileContainer.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ifneq ($(BOLOS_SDK),)
$(error Containerized build, BOLOS_SDK should be empty)
endif

APP_BUILDER_IMAGE = ledger-app-builder:d5bfe2e793f15a826971ae9de2adcad524df3e8e
APP_BUILDER_IMAGE = ledger-app-builder:3.9.0

default_target: build

Expand Down
2 changes: 1 addition & 1 deletion MakefileSpeculos.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#*******************************************************************************

SPECULOS_IMAGE = speculos:sha-6a34680
SPECULOS_IMAGE = speculos:sha-c59b939

define run_announce
@perl -e 'use Time::HiRes; use POSIX; $$ts = sprintf qq[%f], Time::HiRes::time(); ($$f) = $$ts =~ m~(\....)~; printf qq[%s%s %s make: %s\n], POSIX::strftime("%H:%M:%S", gmtime), $$f, q[-] x 126, $$ARGV[0];' "$(1)"
Expand Down
1 change: 0 additions & 1 deletion src/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ unsigned short io_exchange_al(unsigned char channel, unsigned short tx_len) {
return 0;
}

STATIC_ASSERT(CX_APILEVEL >= 9, "bad api level");
static const unsigned PIN_VERIFIED = BOLOS_UX_OK; // Seems to work for api 9/10

bool device_is_unlocked() {
Expand Down
1 change: 0 additions & 1 deletion src/keyDerivation.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ __noinline_due_to_stack__ WARN_UNUSED_RESULT uint16_t derivePrivateKey(const bip

// Sanity check
CRYPTO_ASSERT(pathSpec->length < ARRAY_LEN(pathSpec->path));
STATIC_ASSERT(CX_APILEVEL >= 5, "unsupported api level");
TRACE();

CRYPTO_CX_CHECK(os_derive_bip32_with_seed_no_throw(HDW_NORMAL,
Expand Down
6 changes: 0 additions & 6 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
#include "assert.h"
#include "io.h"

// The whole app is designed for a specific api level.
// In case there is an api change, first *verify* changes
// (especially potential security implications) before bumping
// the API level!
STATIC_ASSERT(CX_APILEVEL >= 9, "bad api level");

static const int INS_NONE = -1;

// ui_idle displays the main menu. Note that your app isn't required to use a
Expand Down
Loading