arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-02 10:51:06 +00:00
Code Issues Releases Wiki Activity

stellar: account fields are strings (addresses) not bytes (pubkeys)

Browse Source
This commit is contained in:
Tomas Susanka 2018-06-14 11:12:52 +02:00
parent 97027f5c88
commit 2f2888fba1
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
protob/messages.proto
View File

@ -1049,7 +1049,7 @@ message StellarSignTx {
optional uint32 protocol_version = 1; // version of the protofbuf messaging protocol the client is using optional uint32 protocol_version = 1; // version of the protofbuf messaging protocol the client is using
repeated uint32 address_n = 2; // BIP-32 path. For compatibility with other wallets, must be m/44'/148'/index' repeated uint32 address_n = 2; // BIP-32 path. For compatibility with other wallets, must be m/44'/148'/index'
optional string network_passphrase = 3; // passphrase for signing messages on the destination network optional string network_passphrase = 3; // passphrase for signing messages on the destination network
optional bytes source_account = 4; // 32-byte source optional string source_account = 4; // source account address
optional uint32 fee = 5; // Fee (in stroops) for the transaction optional uint32 fee = 5; // Fee (in stroops) for the transaction
optional uint64 sequence_number = 6; // transaction sequence number optional uint64 sequence_number = 6; // transaction sequence number
optional uint32 timebounds_start = 8; // unix timestamp (client must truncate this to 32 bytes) optional uint32 timebounds_start = 8; // unix timestamp (client must truncate this to 32 bytes)
@ -1086,9 +1086,9 @@ message StellarTxOpRequest {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarPaymentOp { message StellarPaymentOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional bytes destination_account = 2; // 32-byte destination account optional string destination_account = 2; // destination account address
optional StellarAssetType asset = 3; // asset involved in the operation optional StellarAssetType asset = 3; // asset involved in the operation
optional sint64 amount = 4; // amount of the given asset to pay optional sint64 amount = 4; // amount of the given asset to pay
} }
@ -1100,9 +1100,9 @@ message StellarPaymentOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarCreateAccountOp { message StellarCreateAccountOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional bytes new_account = 2; // 32-byte account ID to create optional string new_account = 2; // account address to create
optional sint64 starting_balance = 3; // initial starting balance for the new account optional sint64 starting_balance = 3; // initial starting balance for the new account
} }
@ -1113,11 +1113,11 @@ message StellarCreateAccountOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarPathPaymentOp { message StellarPathPaymentOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source address
optional StellarAssetType send_asset = 2; optional StellarAssetType send_asset = 2;
optional sint64 send_max = 3; optional sint64 send_max = 3;
optional bytes destination_account = 4; optional string destination_account = 4;
optional StellarAssetType destination_asset = 5; optional StellarAssetType destination_asset = 5;
optional sint64 destination_amount = 6; optional sint64 destination_amount = 6;
repeated StellarAssetType paths = 7; repeated StellarAssetType paths = 7;
@ -1130,7 +1130,7 @@ message StellarPathPaymentOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarManageOfferOp { message StellarManageOfferOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional StellarAssetType selling_asset = 2; optional StellarAssetType selling_asset = 2;
optional StellarAssetType buying_asset = 3; optional StellarAssetType buying_asset = 3;
@ -1147,7 +1147,7 @@ message StellarManageOfferOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarCreatePassiveOfferOp { message StellarCreatePassiveOfferOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional StellarAssetType selling_asset = 2; optional StellarAssetType selling_asset = 2;
optional StellarAssetType buying_asset = 3; optional StellarAssetType buying_asset = 3;
@ -1163,9 +1163,9 @@ message StellarCreatePassiveOfferOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarSetOptionsOp { message StellarSetOptionsOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional bytes inflation_destination_account = 2; // (optional) 32-byte inflation destination optional string inflation_destination_account = 2; // (optional) inflation destination address
optional uint32 clear_flags = 3; optional uint32 clear_flags = 3;
optional uint32 set_flags = 4; optional uint32 set_flags = 4;
optional uint32 master_weight = 5; optional uint32 master_weight = 5;
@ -1185,7 +1185,7 @@ message StellarSetOptionsOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarChangeTrustOp { message StellarChangeTrustOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional StellarAssetType asset = 2; optional StellarAssetType asset = 2;
optional uint64 limit = 3; optional uint64 limit = 3;
@ -1198,9 +1198,9 @@ message StellarChangeTrustOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarAllowTrustOp { message StellarAllowTrustOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional bytes trusted_account = 2; // The account being allowed to hold the asset optional string trusted_account = 2; // The account being allowed to hold the asset
optional uint32 asset_type = 3; // 1 = 4-character, 2 = 12-character optional uint32 asset_type = 3; // 1 = 4-character, 2 = 12-character
optional string asset_code = 4; // human-readable asset code optional string asset_code = 4; // human-readable asset code
optional uint32 is_authorized = 5; optional uint32 is_authorized = 5;
@ -1213,9 +1213,8 @@ message StellarAllowTrustOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarAccountMergeOp { message StellarAccountMergeOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional string destination_account = 2; // destination account address
optional bytes destination_account = 2; // 32-byte destination account
} }
/** /**
@ -1225,7 +1224,7 @@ message StellarAccountMergeOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarManageDataOp { message StellarManageDataOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional string key = 2; optional string key = 2;
optional bytes value = 3; // 64 bytes of arbitrary data optional bytes value = 3; // 64 bytes of arbitrary data
@ -1238,7 +1237,7 @@ message StellarManageDataOp {
* @next StellarSignedTx * @next StellarSignedTx
*/ */
message StellarBumpSequenceOp { message StellarBumpSequenceOp {
optional bytes source_account = 1; // (optional) 32-byte source account optional string source_account = 1; // (optional) source account address
optional uint64 bump_to = 2; // new sequence number optional uint64 bump_to = 2; // new sequence number
} }

2
protob/types.proto
View File

@ -435,7 +435,7 @@ enum NEMImportanceTransferMode {
message StellarAssetType { message StellarAssetType {
optional uint32 type = 1; // 0 = native asset (XLM), 1 = alphanum 4, 2 = alphanum 12 optional uint32 type = 1; // 0 = native asset (XLM), 1 = alphanum 4, 2 = alphanum 12
optional string code = 2; // for non-native assets, string describing the code optional string code = 2; // for non-native assets, string describing the code
optional bytes issuer = 3; // 32-byte issuing address optional string issuer = 3; // issuing address
} }
/** /**