d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement support for EIP1559; No settings

Browse Source
This commit is contained in:
pscott
2021-06-10 17:17:47 +02:00
parent 4294c0a1a3
commit df4fe3c0dd
5 changed files with 155 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_features/signTx/cmd_signTx.c
View File

@@ -45,7 +45,7 @@ void handleSign(uint8_t p1,
uint8_t txType = *workBuffer;
if (txType >= MIN_TX_TYPE && txType <= MAX_TX_TYPE) {
// Enumerate through all supported txTypes here...
if (txType == EIP2930) {
if (txType == EIP2930 || txType == EIP1559) {
txContext.txType = txType;
workBuffer++;
dataLength--;
@@ -89,6 +89,7 @@ void handleSign(uint8_t p1,
THROW(0x6A80);
}
PRINTF("FINALIZE\n");
if (txResult == USTREAM_FINISHED) {
finalizeParsing(false);
}

11
src_features/signTx/logic_signTx.c
View File

@@ -29,7 +29,8 @@ uint32_t splitBinaryParameterPart(char *result, uint8_t *parameter) {
customStatus_e customProcessor(txContext_t *context) {
if (((context->txType == LEGACY && context->currentField == LEGACY_RLP_DATA) ||
(context->txType == EIP2930 && context->currentField == EIP2930_RLP_DATA)) &&
(context->txType == EIP2930 && context->currentField == EIP2930_RLP_DATA) ||
(context->txType == EIP1559 && context->currentField == EIP1559_RLP_DATA)) &&
(context->currentFieldLength != 0)) {
dataPresent = true;
// If handling a new contract rather than a function call, abort immediately
@@ -245,13 +246,14 @@ void finalizeParsing(bool direct) {
tokenDefinition_t *token1 = NULL, *token2 = NULL;
bool genericUI = true;
PRINTF("FINALIZING\n");
// Verify the chain
if (chainConfig->chainId != 0) {
uint32_t id = 0;
if (txContext.txType == LEGACY) {
id = u32_from_BE(txContext.content->v, txContext.content->vLength, true);
} else if (txContext.txType == EIP2930) {
} else if (txContext.txType == EIP2930 || txContext.txType == EIP1559) {
id = u32_from_BE(txContext.content->chainID.value,
txContext.content->chainID.length,
false);
@@ -278,6 +280,7 @@ void finalizeParsing(bool direct) {
32);
// Finalize the plugin handling
PRINTF("1\n");
if (dataContext.tokenContext.pluginStatus >= ETH_PLUGIN_RESULT_SUCCESSFUL) {
genericUI = false;
eth_plugin_prepare_finalize(&pluginFinalize);
@@ -357,6 +360,7 @@ void finalizeParsing(bool direct) {
}
}
PRINTF("2\n");
if (dataPresent && !N_storage.dataAllowed) {
reportFinalizeError(direct);
if (!direct) {
@@ -414,7 +418,7 @@ void finalizeParsing(bool direct) {
// the output was truncated. Return the appropriate error code.
THROW(0x6502);
}
} else if (txContext.txType == EIP2930) {
} else if (txContext.txType == EIP2930 || txContext.txType == EIP1559) {
uint256_t chainID;
convertUint256BE(tmpContent.txContent.chainID.value,
tmpContent.txContent.chainID.length,
@@ -426,6 +430,7 @@ void finalizeParsing(bool direct) {
return;
}
}
PRINTF("3\n");
bool no_consent;

2
src_features/signTx/ui_flow_signTx.c
View File

@@ -174,7 +174,7 @@ void ux_approve_tx(bool dataPresent) {
uint32_t id;
if (txContext.txType == LEGACY) {
id = u32_from_BE(txContext.content->v, txContext.content->vLength, true);
} else if (txContext.txType == EIP2930) {
} else if (txContext.txType == EIP2930 || txContext.txType == EIP1559) {
id =
u32_from_BE(txContext.content->chainID.value, txContext.content->chainID.length, false);
} else {