p2sh addresses can have 35 characters

This commit is contained in:
Pavol Rusnak 2014-12-22 21:16:49 +01:00
parent 30a55829e5
commit 1674edcbac
4 changed files with 16 additions and 16 deletions

View File

@ -30,7 +30,7 @@ PublicKey.xpub max_size:113
GetAddress.address_n max_count:8 GetAddress.address_n max_count:8
GetAddress.coin_name max_size:17 GetAddress.coin_name max_size:17
Address.address max_size:35 Address.address max_size:36
LoadDevice.mnemonic max_size:241 LoadDevice.mnemonic max_size:241
LoadDevice.pin max_size:10 LoadDevice.pin max_size:10
@ -51,11 +51,11 @@ SignMessage.address_n max_count:8
SignMessage.message max_size:1024 SignMessage.message max_size:1024
SignMessage.coin_name max_size:17 SignMessage.coin_name max_size:17
VerifyMessage.address max_size:35 VerifyMessage.address max_size:36
VerifyMessage.signature max_size:65 VerifyMessage.signature max_size:65
VerifyMessage.message max_size:1024 VerifyMessage.message max_size:1024
MessageSignature.address max_size:35 MessageSignature.address max_size:36
MessageSignature.signature max_size:65 MessageSignature.signature max_size:65
EncryptMessage.pubkey max_size:33 EncryptMessage.pubkey max_size:33
@ -72,7 +72,7 @@ DecryptMessage.nonce max_size:33
DecryptMessage.message max_size:1120 # 1 + 9 + 1024 + 21 + 65 DecryptMessage.message max_size:1120 # 1 + 9 + 1024 + 21 + 65
DecryptMessage.hmac max_size:8 DecryptMessage.hmac max_size:8
DecryptedMessage.address max_size:35 DecryptedMessage.address max_size:36
DecryptedMessage.message max_size:1024 DecryptedMessage.message max_size:1024
CipherKeyValue.address_n max_count:8 CipherKeyValue.address_n max_count:8

View File

@ -115,7 +115,7 @@ typedef struct _WordRequest {
} WordRequest; } WordRequest;
typedef struct _Address { typedef struct _Address {
char address[35]; char address[36];
} Address; } Address;
typedef struct _ApplySettings { typedef struct _ApplySettings {
@ -226,7 +226,7 @@ typedef struct _DecryptedMessage {
bool has_message; bool has_message;
DecryptedMessage_message_t message; DecryptedMessage_message_t message;
bool has_address; bool has_address;
char address[35]; char address[36];
} DecryptedMessage; } DecryptedMessage;
typedef PB_BYTES_ARRAY_T(33) EncryptMessage_pubkey_t; typedef PB_BYTES_ARRAY_T(33) EncryptMessage_pubkey_t;
@ -372,7 +372,7 @@ typedef PB_BYTES_ARRAY_T(65) MessageSignature_signature_t;
typedef struct _MessageSignature { typedef struct _MessageSignature {
bool has_address; bool has_address;
char address[35]; char address[36];
bool has_signature; bool has_signature;
MessageSignature_signature_t signature; MessageSignature_signature_t signature;
} MessageSignature; } MessageSignature;
@ -495,7 +495,7 @@ typedef PB_BYTES_ARRAY_T(1024) VerifyMessage_message_t;
typedef struct _VerifyMessage { typedef struct _VerifyMessage {
bool has_address; bool has_address;
char address[35]; char address[36];
bool has_signature; bool has_signature;
VerifyMessage_signature_t signature; VerifyMessage_signature_t signature;
bool has_message; bool has_message;
@ -819,7 +819,7 @@ extern const pb_field_t DebugLinkLog_fields[4];
#define GetPublicKey_size 48 #define GetPublicKey_size 48
#define PublicKey_size (121 + HDNodeType_size) #define PublicKey_size (121 + HDNodeType_size)
#define GetAddress_size (75 + MultisigRedeemScriptType_size) #define GetAddress_size (75 + MultisigRedeemScriptType_size)
#define Address_size 37 #define Address_size 38
#define WipeDevice_size 0 #define WipeDevice_size 0
#define LoadDevice_size (320 + HDNodeType_size) #define LoadDevice_size (320 + HDNodeType_size)
#define ResetDevice_size 66 #define ResetDevice_size 66
@ -829,12 +829,12 @@ extern const pb_field_t DebugLinkLog_fields[4];
#define WordRequest_size 0 #define WordRequest_size 0
#define WordAck_size 14 #define WordAck_size 14
#define SignMessage_size 1094 #define SignMessage_size 1094
#define VerifyMessage_size 1131 #define VerifyMessage_size 1132
#define MessageSignature_size 104 #define MessageSignature_size 105
#define EncryptMessage_size 1131 #define EncryptMessage_size 1131
#define EncryptedMessage_size 1168 #define EncryptedMessage_size 1168
#define DecryptMessage_size 1216 #define DecryptMessage_size 1216
#define DecryptedMessage_size 1064 #define DecryptedMessage_size 1065
#define CipherKeyValue_size 1340 #define CipherKeyValue_size 1340
#define CipheredKeyValue_size 1027 #define CipheredKeyValue_size 1027
#define EstimateTxSize_size 31 #define EstimateTxSize_size 31

View File

@ -11,7 +11,7 @@ TxInputType.address_n max_count:8
TxInputType.prev_hash max_size:32 TxInputType.prev_hash max_size:32
TxInputType.script_sig max_size:1650 TxInputType.script_sig max_size:1650
TxOutputType.address max_size:35 TxOutputType.address max_size:36
TxOutputType.address_n max_count:8 TxOutputType.address_n max_count:8
TxOutputBinType.script_pubkey max_size:520 TxOutputBinType.script_pubkey max_size:520

View File

@ -161,7 +161,7 @@ typedef struct _TxInputType {
typedef struct _TxOutputType { typedef struct _TxOutputType {
bool has_address; bool has_address;
char address[35]; char address[36];
pb_size_t address_n_count; pb_size_t address_n_count;
uint32_t address_n[8]; uint32_t address_n[8];
uint64_t amount; uint64_t amount;
@ -284,9 +284,9 @@ extern const pb_field_t TxRequestSerializedType_fields[4];
#define CoinType_size 47 #define CoinType_size 47
#define MultisigRedeemScriptType_size 3741 #define MultisigRedeemScriptType_size 3741
#define TxInputType_size 5497 #define TxInputType_size 5497
#define TxOutputType_size 3846 #define TxOutputType_size 3847
#define TxOutputBinType_size 534 #define TxOutputBinType_size 534
#define TransactionType_size 9910 #define TransactionType_size 9911
#define TxRequestDetailsType_size 40 #define TxRequestDetailsType_size 40
#define TxRequestSerializedType_size 2132 #define TxRequestSerializedType_size 2132