From ea5992d0309355130cc72b5b8b07a5f3cb8008e9 Mon Sep 17 00:00:00 2001 From: dbornside Date: Sat, 14 Jul 2018 18:26:48 -0400 Subject: [PATCH] Alpha: change `managerPubkey` to underscores in json field names --- docs/api/rpc_proposal.rst | 32 +++++++++---------- .../lib_protocol/src/operation_repr.ml | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/api/rpc_proposal.rst b/docs/api/rpc_proposal.rst index 38c9be402..07b07a725 100644 --- a/docs/api/rpc_proposal.rst +++ b/docs/api/rpc_proposal.rst @@ -2990,7 +2990,7 @@ Protocol Alpha || { "kind": "origination", "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -3118,7 +3118,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -5187,7 +5187,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -5611,7 +5611,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -5898,7 +5898,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -6243,7 +6243,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -6441,7 +6441,7 @@ Protocol Alpha || { "kind": "origination", "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -6569,7 +6569,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -7150,7 +7150,7 @@ Protocol Alpha || { "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], "kind": "origination", - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -7471,7 +7471,7 @@ Protocol Alpha || { "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], "kind": "origination", - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -8403,7 +8403,7 @@ Protocol Alpha || { "kind": "origination", "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -8531,7 +8531,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -8859,7 +8859,7 @@ Protocol Alpha || { "kind": "origination", "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -8987,7 +8987,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -9315,7 +9315,7 @@ Protocol Alpha || { "kind": "origination", "source": $contract_id, "nonce": integer ∈ [0, 2^16-1], - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": @@ -9443,7 +9443,7 @@ Protocol Alpha "counter": integer ∈ [-2^31-2, 2^31+2], "gas_limit": $bignum, "storage_limit": integer ∈ [-2^31-2, 2^31+2] || string, - "managerPubkey": + "manager_pubkey": string /* A Secp256k1 or Ed25519 public key hash (Base58Check-encoded) */, "balance": diff --git a/src/proto_alpha/lib_protocol/src/operation_repr.ml b/src/proto_alpha/lib_protocol/src/operation_repr.ml index f6302e130..17a62d71c 100644 --- a/src/proto_alpha/lib_protocol/src/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/src/operation_repr.ml @@ -253,7 +253,7 @@ module Encoding = struct name = "origination" ; encoding = (obj6 - (req "managerPubkey" Signature.Public_key_hash.encoding) + (req "manager_pubkey" Signature.Public_key_hash.encoding) (req "balance" Tez_repr.encoding) (dft "spendable" bool true) (dft "delegatable" bool true)