diff --git a/koinos/broadcast/broadcast.proto b/koinos/broadcast/broadcast.proto index caf8d57..e4fe208 100644 --- a/koinos/broadcast/broadcast.proto +++ b/koinos/broadcast/broadcast.proto @@ -11,6 +11,9 @@ message transaction_accepted { protocol.transaction transaction = 1; protocol.transaction_receipt receipt = 2; uint64 height = 3 [jstype = JS_STRING]; + uint64 system_disk_storage_used = 4; + uint64 system_network_bandwidth_used = 5; + uint64 system_compute_bandwidth_used = 6; } message transaction_failed { diff --git a/koinos/mempool/mempool.proto b/koinos/mempool/mempool.proto index 28156e6..e49f06d 100644 --- a/koinos/mempool/mempool.proto +++ b/koinos/mempool/mempool.proto @@ -14,10 +14,17 @@ message address_resource_record { uint64 current_rc = 2; } -message pending_transaction_record { +message pending_transaction { protocol.transaction transaction = 1; + uint64 disk_storage_used = 2 [jstype = JS_STRING]; + uint64 network_bandwidth_used = 3 [jstype = JS_STRING]; + uint64 compute_bandwidth_used = 4 [jstype = JS_STRING]; + uint64 system_disk_storage_used = 5 [jstype = JS_STRING]; + uint64 system_network_bandwidth_used = 6 [jstype = JS_STRING]; + uint64 system_compute_bandwidth_used = 7 [jstype = JS_STRING]; +} + +message pending_transaction_record { + pending_transaction pending_transaction = 1; uint64 timestamp = 2; - uint64 disk_storage_used = 3; - uint64 network_bandwidth_used = 4; - uint64 compute_bandwidth_used = 5; } diff --git a/koinos/rpc/mempool/mempool_rpc.proto b/koinos/rpc/mempool/mempool_rpc.proto index a6b91c1..2a199ea 100644 --- a/koinos/rpc/mempool/mempool_rpc.proto +++ b/koinos/rpc/mempool/mempool_rpc.proto @@ -4,16 +4,10 @@ package koinos.rpc.mempool; option go_package = "github.com/koinos/koinos-proto-golang/v2/koinos/rpc/mempool"; import "koinos/options.proto"; +import "koinos/mempool/mempool.proto"; import "koinos/protocol/protocol.proto"; import "koinos/rpc/rpc.proto"; -message pending_transaction { - protocol.transaction transaction = 1; - uint64 disk_storage_used = 2 [jstype = JS_STRING]; - uint64 network_bandwidth_used = 3 [jstype = JS_STRING]; - uint64 compute_bandwidth_used = 4 [jstype = JS_STRING]; -} - message check_pending_account_resources_request { bytes payer = 1 [(btype) = ADDRESS]; uint64 max_payer_rc = 2 [jstype = JS_STRING]; @@ -31,7 +25,7 @@ message get_pending_transactions_request { } message get_pending_transactions_response { - repeated pending_transaction pending_transactions = 1; + repeated koinos.mempool.pending_transaction pending_transactions = 1; } message check_account_nonce_request {