Skip to content

Commit a84c307

Browse files
authored
Merge branch 'LedgerHQ:develop' into 7702-phase1
2 parents 61608ab + dbba2fb commit a84c307

File tree

119 files changed

+2842
-319
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+2842
-319
lines changed

.github/workflows/cflite_cron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
uses: google/clusterfuzzlite/actions/run_fuzzers@v1
3636
with:
3737
github-token: ${{ secrets.GITHUB_TOKEN }}
38-
fuzz-seconds: 300 # 5 minutes
38+
fuzz-seconds: 900 # 15 minutes
3939
mode: ${{ matrix.mode }}
4040
sanitizer: ${{ matrix.sanitizer }}

.github/workflows/codeql_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
language: ['cpp']
2525
runs-on: ubuntu-latest
2626
container:
27-
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
27+
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
2828

2929
steps:
3030
- name: Clone

Makefile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ PATH_APP_LOAD_PARAMS += "45'" "44'/1'"
103103
VARIANT_PARAM = CHAIN
104104
VARIANT_VALUES = $(SUPPORTED_CHAINS)
105105

106-
# Activate dependency only for specific CHAIN
107-
ifneq ($(CHAIN),ethereum)
108-
DEP_APP_LOAD_PARAMS = Ethereum:$(APPVERSION)
109-
DEFINES_LIB = USE_LIB_ETHEREUM
110-
endif
111-
112106
# Enabling DEBUG flag will enable PRINTF and disable optimizations
113107
#DEBUG = 1
114108

@@ -117,9 +111,16 @@ endif
117111
########################################
118112
# See SDK `include/appflags.h` for the purpose of each permission
119113
#HAVE_APPLICATION_FLAG_DERIVE_MASTER = 1
120-
HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1
121-
HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
122-
HAVE_APPLICATION_FLAG_LIBRARY = 1
114+
#HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1
115+
#HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1
116+
ifeq ($(CHAIN),ethereum)
117+
HAVE_APPLICATION_FLAG_LIBRARY = 1
118+
else
119+
# Activate dependency only for specific CHAIN
120+
DEP_APP_LOAD_PARAMS = Ethereum:$(APPVERSION)
121+
DEFINES_LIB = USE_LIB_ETHEREUM
122+
endif
123+
123124

124125
########################################
125126
# Application communication interfaces #

client/src/ledger_app_clients/ethereum/enum_value.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from enum import IntEnum
22
from typing import Optional
3-
from .tlv import format_tlv
3+
from .tlv import TlvSerializable
44
from .keychain import sign_data, Key
55

66

@@ -15,7 +15,7 @@ class Tag(IntEnum):
1515
SIGNATURE = 0xff
1616

1717

18-
class EnumValue:
18+
class EnumValue(TlvSerializable):
1919
version: int
2020
chain_id: int
2121
contract_addr: bytes
@@ -45,15 +45,15 @@ def __init__(self,
4545

4646
def serialize(self) -> bytes:
4747
payload = bytearray()
48-
payload += format_tlv(Tag.VERSION, self.version)
49-
payload += format_tlv(Tag.CHAIN_ID, self.chain_id)
50-
payload += format_tlv(Tag.CONTRACT_ADDR, self.contract_addr)
51-
payload += format_tlv(Tag.SELECTOR, self.selector)
52-
payload += format_tlv(Tag.ID, self.id)
53-
payload += format_tlv(Tag.VALUE, self.value)
54-
payload += format_tlv(Tag.NAME, self.name)
48+
payload += self.serialize_field(Tag.VERSION, self.version)
49+
payload += self.serialize_field(Tag.CHAIN_ID, self.chain_id)
50+
payload += self.serialize_field(Tag.CONTRACT_ADDR, self.contract_addr)
51+
payload += self.serialize_field(Tag.SELECTOR, self.selector)
52+
payload += self.serialize_field(Tag.ID, self.id)
53+
payload += self.serialize_field(Tag.VALUE, self.value)
54+
payload += self.serialize_field(Tag.NAME, self.name)
5555
sig = self.signature
5656
if sig is None:
5757
sig = sign_data(Key.CALLDATA, payload)
58-
payload += format_tlv(Tag.SIGNATURE, sig)
58+
payload += self.serialize_field(Tag.SIGNATURE, sig)
5959
return payload

0 commit comments

Comments
 (0)