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

Add setting to display detailed fees

Browse Source
This commit is contained in:
pscott
2021-06-11 11:37:16 +02:00
parent bb6f65ad75
commit 0bff1de52c
9 changed files with 169 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src_common/ethUstream.c
View File

@@ -179,14 +179,12 @@ static void processMaxPriorityFeePerGas(txContext_t *context) {
THROW(EXCEPTION);
}
if (context->currentFieldPos < context->currentFieldLength) {
uint8_t tmp[100];
uint32_t copySize =
MIN(context->commandLength, context->currentFieldLength - context->currentFieldPos);
// copyTxData(context, NULL, copySize);
copyTxData(context, &tmp, copySize);
copyTxData(context, context->content->maxPriorityFeePerGas.value + context->currentFieldPos, copySize);
}
if (context->currentFieldPos == context->currentFieldLength) {
// context->content->nonce.length = context->currentFieldLength;
context->content->maxPriorityFeePerGas.length = context->currentFieldLength;
context->currentField++;
context->processingField = false;
}
@@ -286,6 +284,26 @@ static void processData(txContext_t *context) {
PRINTF("Invalid type for RLP_DATA\n");
THROW(EXCEPTION);
}
if (context->currentFieldPos < context->currentFieldLength) {
uint32_t copySize =
MIN(context->commandLength, context->currentFieldLength - context->currentFieldPos);
// If there is no data, set dataPresent to false.
if (copySize == 1 && *context->workBuffer == 0x00) {
context->content->dataPresent = false;
}
copyTxData(context, NULL, copySize);
}
if (context->currentFieldPos == context->currentFieldLength) {
context->currentField++;
context->processingField = false;
}
}
static void processAndDiscard(txContext_t *context) {
if (context->currentFieldIsList) {
PRINTF("Invalid type for Discarded field\n");
THROW(EXCEPTION);
}
if (context->currentFieldPos < context->currentFieldLength) {
uint32_t copySize =
MIN(context->commandLength, context->currentFieldLength - context->currentFieldPos);
@@ -319,7 +337,6 @@ static void processV(txContext_t *context) {
}
static bool processEIP1559Tx(txContext_t *context) {
PRINTF("1559\n");
switch (context->currentField) {
case EIP1559_RLP_CONTENT: {
processContent(context);
@@ -375,7 +392,7 @@ static bool processEIP1559Tx(txContext_t *context) {
}
case EIP1559_RLP_SENDER_R:
case EIP1559_RLP_SENDER_S:
processData(context);
processAndDiscard(context);
break;
default:
PRINTF("Invalid RLP decoder context\n");
@@ -417,14 +434,15 @@ static bool processEIP2930Tx(txContext_t *context) {
case EIP2930_RLP_YPARITY:
processV(context);
break;
case EIP2930_RLP_DATA:
processData(context);
break;
case EIP2930_RLP_ACCESS_LIST:
processAccessList(context);
break;
case EIP2930_RLP_DATA:
case EIP2930_RLP_SENDER_R:
case EIP2930_RLP_SENDER_S:
processData(context);
PRINTF("DONE\n");
processAndDiscard(context);
break;
default:
PRINTF("Invalid RLP decoder context\n");
@@ -461,9 +479,11 @@ static bool processLegacyTx(txContext_t *context) {
processValue(context);
break;
case LEGACY_RLP_DATA:
processData(context);
break;
case LEGACY_RLP_R:
case LEGACY_RLP_S:
processData(context);
processAndDiscard(context);
break;
case LEGACY_RLP_V:
processV(context);

8
src_common/ethUstream.h
View File

@@ -83,8 +83,8 @@ typedef enum rlpEIP2930TxField_e {
typedef enum rlpEIP1559TxField_e {
EIP1559_RLP_NONE = RLP_NONE,
EIP1559_RLP_TYPE, // For wanchain
EIP1559_RLP_CONTENT,
EIP1559_RLP_TYPE, // For wanchain
EIP1559_RLP_CHAINID,
EIP1559_RLP_NONCE,
EIP1559_RLP_MAX_PRIORITY_FEE_PER_GAS,
@@ -125,8 +125,9 @@ typedef struct txInt256_t {
} txInt256_t;
typedef struct txContent_t {
txInt256_t gasprice;
txInt256_t startgas;
txInt256_t gasprice; // Used as MaxFeePerGas when dealing with EIP1559 transactions.
txInt256_t startgas; // Also known as `gasLimit`.
txInt256_t maxPriorityFeePerGas;
txInt256_t value;
txInt256_t nonce;
txInt256_t chainID;
@@ -134,6 +135,7 @@ typedef struct txContent_t {
uint8_t destinationLength;
uint8_t v[4];
uint8_t vLength;
bool dataPresent;
} txContent_t;
typedef struct txContext_t {