Merge pull request #33 from tomerweller/master

tomerweller · web-flow · commit fd162d8215f9 · 2018-04-03T15:51:31.000-07:00
add bumpseq support
diff --git a/generated/stellar-base-generated.rb b/generated/stellar-base-generated.rb
@@ -32,7 +32,7 @@ module Stellar
   Thresholds = XDR::Opaque[4]
   String32 = XDR::String[32]
   String64 = XDR::String[64]
-  SequenceNumber = Uint64
+  SequenceNumber = Int64
   DataValue = XDR::VarOpaque[64]
   autoload :AssetType
   autoload :Asset
@@ -67,6 +67,7 @@ module Stellar
   autoload :ChangeTrustOp
   autoload :AllowTrustOp
   autoload :ManageDataOp
+  autoload :BumpSequenceOp
   autoload :Operation
   autoload :MemoType
   autoload :Memo
@@ -99,6 +100,8 @@ module Stellar
   autoload :InflationResult
   autoload :ManageDataResultCode
   autoload :ManageDataResult
+  autoload :BumpSequenceResultCode
+  autoload :BumpSequenceResult
   autoload :OperationResultCode
   autoload :OperationResult
   autoload :TransactionResultCode
@@ -128,6 +131,7 @@ module Stellar
   autoload :LedgerEntryChange
   LedgerEntryChanges = XDR::VarArray[LedgerEntryChange]
   autoload :OperationMeta
+  autoload :TransactionMetaV1
   autoload :TransactionMeta
 end
 module Stellar
diff --git a/generated/stellar/account_merge_result_code.rb b/generated/stellar/account_merge_result_code.rb
@@ -10,10 +10,11 @@
 #       // codes considered as "success" for the operation
 #       ACCOUNT_MERGE_SUCCESS = 0,
 #       // codes considered as "failure" for the operation
-#       ACCOUNT_MERGE_MALFORMED = -1,      // can't merge onto itself
-#       ACCOUNT_MERGE_NO_ACCOUNT = -2,     // destination does not exist
-#       ACCOUNT_MERGE_IMMUTABLE_SET = -3,  // source account has AUTH_IMMUTABLE set
-#       ACCOUNT_MERGE_HAS_SUB_ENTRIES = -4 // account has trust lines/offers
+#       ACCOUNT_MERGE_MALFORMED = -1,       // can't merge onto itself
+#       ACCOUNT_MERGE_NO_ACCOUNT = -2,      // destination does not exist
+#       ACCOUNT_MERGE_IMMUTABLE_SET = -3,   // source account has AUTH_IMMUTABLE set
+#       ACCOUNT_MERGE_HAS_SUB_ENTRIES = -4, // account has trust lines/offers
+#       ACCOUNT_MERGE_SEQNUM_TOO_FAR = -5   // sequence number is over max allowed
 #   };
 #
 # ===========================================================================
@@ -24,6 +25,7 @@ class AccountMergeResultCode < XDR::Enum
     member :account_merge_no_account,      -2
     member :account_merge_immutable_set,   -3
     member :account_merge_has_sub_entries, -4
+    member :account_merge_seqnum_too_far,  -5
 
     seal
   end
diff --git a/generated/stellar/allow_trust_result_code.rb b/generated/stellar/allow_trust_result_code.rb
@@ -14,7 +14,7 @@
 #       ALLOW_TRUST_NO_TRUST_LINE = -2, // trustor does not have a trustline
 #                                       // source account does not require trust
 #       ALLOW_TRUST_TRUST_NOT_REQUIRED = -3,
-#       ALLOW_TRUST_CANT_REVOKE = -4, // source account can't revoke trust,
+#       ALLOW_TRUST_CANT_REVOKE = -4,     // source account can't revoke trust,
 #       ALLOW_TRUST_SELF_NOT_ALLOWED = -5 // trusting self is not allowed
 #   };
 #
diff --git a/generated/stellar/change_trust_result_code.rb b/generated/stellar/change_trust_result_code.rb
@@ -14,7 +14,8 @@
 #       CHANGE_TRUST_NO_ISSUER = -2,     // could not find issuer
 #       CHANGE_TRUST_INVALID_LIMIT = -3, // cannot drop limit below balance
 #                                        // cannot create with a limit of 0
-#       CHANGE_TRUST_LOW_RESERVE = -4, // not enough funds to create a new trust line,
+#       CHANGE_TRUST_LOW_RESERVE =
+#           -4, // not enough funds to create a new trust line,
 #       CHANGE_TRUST_SELF_NOT_ALLOWED = -5 // trusting self is not allowed
 #   };
 #
diff --git a/generated/stellar/manage_data_op.rb b/generated/stellar/manage_data_op.rb
@@ -7,8 +7,8 @@
 #
 #   struct ManageDataOp
 #   {
-#       string64 dataName; 
-#       DataValue* dataValue;   // set to null to clear
+#       string64 dataName;
+#       DataValue* dataValue; // set to null to clear
 #   };
 #
 # ===========================================================================
diff --git a/generated/stellar/manage_data_result_code.rb b/generated/stellar/manage_data_result_code.rb
@@ -10,10 +10,12 @@
 #       // codes considered as "success" for the operation
 #       MANAGE_DATA_SUCCESS = 0,
 #       // codes considered as "failure" for the operation
-#       MANAGE_DATA_NOT_SUPPORTED_YET = -1, // The network hasn't moved to this protocol change yet
-#       MANAGE_DATA_NAME_NOT_FOUND = -2,    // Trying to remove a Data Entry that isn't there
-#       MANAGE_DATA_LOW_RESERVE = -3,       // not enough funds to create a new Data Entry
-#       MANAGE_DATA_INVALID_NAME = -4       // Name not a valid string
+#       MANAGE_DATA_NOT_SUPPORTED_YET =
+#           -1, // The network hasn't moved to this protocol change yet
+#       MANAGE_DATA_NAME_NOT_FOUND =
+#           -2, // Trying to remove a Data Entry that isn't there
+#       MANAGE_DATA_LOW_RESERVE = -3, // not enough funds to create a new Data Entry
+#       MANAGE_DATA_INVALID_NAME = -4 // Name not a valid string
 #   };
 #
 # ===========================================================================
diff --git a/generated/stellar/operation.rb b/generated/stellar/operation.rb
@@ -36,6 +36,8 @@
 #           void;
 #       case MANAGE_DATA:
 #           ManageDataOp manageDataOp;
+#       case BUMP_SEQUENCE:
+#           BumpSequenceOp bumpSequenceOp;
 #       }
 #       body;
 #   };
diff --git a/generated/stellar/operation/body.rb b/generated/stellar/operation/body.rb
@@ -29,6 +29,8 @@
 #           void;
 #       case MANAGE_DATA:
 #           ManageDataOp manageDataOp;
+#       case BUMP_SEQUENCE:
+#           BumpSequenceOp bumpSequenceOp;
 #       }
 #
 # ===========================================================================
@@ -48,6 +50,7 @@ class Body < XDR::Union
       switch :account_merge,        :destination
       switch :inflation
       switch :manage_data,          :manage_data_op
+      switch :bump_sequence,        :bump_sequence_op
 
       attribute :create_account_op,       CreateAccountOp
       attribute :payment_op,              PaymentOp
@@ -59,6 +62,7 @@ class Body < XDR::Union
       attribute :allow_trust_op,          AllowTrustOp
       attribute :destination,             AccountID
       attribute :manage_data_op,          ManageDataOp
+      attribute :bump_sequence_op,        BumpSequenceOp
     end
   end
 end
diff --git a/generated/stellar/operation_result.rb b/generated/stellar/operation_result.rb
@@ -32,6 +32,8 @@
 #           InflationResult inflationResult;
 #       case MANAGE_DATA:
 #           ManageDataResult manageDataResult;
+#       case BUMP_SEQUENCE:
+#           BumpSequenceResult bumpSeqResult;
 #       }
 #       tr;
 #   default:
diff --git a/generated/stellar/operation_result/tr.rb b/generated/stellar/operation_result/tr.rb
@@ -29,6 +29,8 @@
 #           InflationResult inflationResult;
 #       case MANAGE_DATA:
 #           ManageDataResult manageDataResult;
+#       case BUMP_SEQUENCE:
+#           BumpSequenceResult bumpSeqResult;
 #       }
 #
 # ===========================================================================
@@ -48,6 +50,7 @@ class Tr < XDR::Union
       switch :account_merge,        :account_merge_result
       switch :inflation,            :inflation_result
       switch :manage_data,          :manage_data_result
+      switch :bump_sequence,        :bump_seq_result
 
       attribute :create_account_result,       CreateAccountResult
       attribute :payment_result,              PaymentResult
@@ -60,6 +63,7 @@ class Tr < XDR::Union
       attribute :account_merge_result,        AccountMergeResult
       attribute :inflation_result,            InflationResult
       attribute :manage_data_result,          ManageDataResult
+      attribute :bump_seq_result,             BumpSequenceResult
     end
   end
 end
diff --git a/generated/stellar/operation_result_code.rb b/generated/stellar/operation_result_code.rb
@@ -9,16 +9,18 @@
 #   {
 #       opINNER = 0, // inner object result is valid
 #   
-#       opBAD_AUTH = -1,  // too few valid signatures / wrong network
-#       opNO_ACCOUNT = -2 // source account was not found
+#       opBAD_AUTH = -1,     // too few valid signatures / wrong network
+#       opNO_ACCOUNT = -2,   // source account was not found
+#       opNOT_SUPPORTED = -3 // operation not supported at this time
 #   };
 #
 # ===========================================================================
 module Stellar
   class OperationResultCode < XDR::Enum
-    member :op_inner,      0
-    member :op_bad_auth,   -1
-    member :op_no_account, -2
+    member :op_inner,         0
+    member :op_bad_auth,      -1
+    member :op_no_account,    -2
+    member :op_not_supported, -3
 
     seal
   end
diff --git a/generated/stellar/operation_type.rb b/generated/stellar/operation_type.rb
@@ -17,7 +17,8 @@
 #       ALLOW_TRUST = 7,
 #       ACCOUNT_MERGE = 8,
 #       INFLATION = 9,
-#       MANAGE_DATA = 10
+#       MANAGE_DATA = 10,
+#       BUMP_SEQUENCE = 11
 #   };
 #
 # ===========================================================================
@@ -34,6 +35,7 @@ class OperationType < XDR::Enum
     member :account_merge,        8
     member :inflation,            9
     member :manage_data,          10
+    member :bump_sequence,        11
 
     seal
   end
diff --git a/generated/stellar/stellar_message.rb b/generated/stellar/stellar_message.rb
@@ -18,7 +18,7 @@
 #   case GET_PEERS:
 #       void;
 #   case PEERS:
-#       PeerAddress peers<>;
+#       PeerAddress peers<100>;
 #   
 #   case GET_TX_SET:
 #       uint256 txSetHash;
@@ -62,7 +62,7 @@ class StellarMessage < XDR::Union
     attribute :hello,              Hello
     attribute :auth,               Auth
     attribute :dont_have,          DontHave
-    attribute :peers,              XDR::VarArray[PeerAddress]
+    attribute :peers,              XDR::VarArray[PeerAddress, 100]
     attribute :tx_set_hash,        Uint256
     attribute :tx_set,             TransactionSet
     attribute :transaction,        TransactionEnvelope
diff --git a/generated/stellar/transaction_envelope.rb b/generated/stellar/transaction_envelope.rb
@@ -10,8 +10,7 @@
 #       Transaction tx;
 #       /* Each decorated signature is a signature over the SHA256 hash of
 #        * a TransactionSignaturePayload */
-#       DecoratedSignature
-#       signatures<20>;
+#       DecoratedSignature signatures<20>;
 #   };
 #
 # ===========================================================================
diff --git a/generated/stellar/transaction_meta.rb b/generated/stellar/transaction_meta.rb
@@ -9,6 +9,8 @@
 #   {
 #   case 0:
 #       OperationMeta operations<>;
+#   case 1:
+#       TransactionMetaV1 v1;
 #   };
 #
 # ===========================================================================
@@ -17,7 +19,9 @@ class TransactionMeta < XDR::Union
     switch_on XDR::Int, :v
 
     switch 0, :operations
+    switch 1, :v1
 
     attribute :operations, XDR::VarArray[OperationMeta]
+    attribute :v1,         TransactionMetaV1
   end
 end
diff --git a/generated/stellar/transaction_signature_payload.rb b/generated/stellar/transaction_signature_payload.rb
@@ -5,14 +5,16 @@
 
 # === xdr source ============================================================
 #
-#   struct TransactionSignaturePayload {
+#   struct TransactionSignaturePayload
+#   {
 #       Hash networkId;
 #       union switch (EnvelopeType type)
 #       {
 #       case ENVELOPE_TYPE_TX:
-#             Transaction tx;
-#       /* All other values of type are invalid */
-#       } taggedTransaction;
+#           Transaction tx;
+#           /* All other values of type are invalid */
+#       }
+#       taggedTransaction;
 #   };
 #
 # ===========================================================================
diff --git a/generated/stellar/transaction_signature_payload/tagged_transaction.rb b/generated/stellar/transaction_signature_payload/tagged_transaction.rb
@@ -8,8 +8,8 @@
 #   union switch (EnvelopeType type)
 #       {
 #       case ENVELOPE_TYPE_TX:
-#             Transaction tx;
-#       /* All other values of type are invalid */
+#           Transaction tx;
+#           /* All other values of type are invalid */
 #       }
 #
 # ===========================================================================
diff --git a/tasks/xdr.rake b/tasks/xdr.rake
@@ -26,7 +26,7 @@ namespace :xdr do
 
     HAYASHI_XDR.each do |src|
       local_path = "xdr/" + File.basename(src)
-      encoded    = client.contents("stellar/stellar-core", path: src, ref: "prod").content
+      encoded    = client.contents("stellar/stellar-core", path: src).content
       decoded    = Base64.decode64 encoded
 
       IO.write(local_path, decoded)
diff --git a/xdr/Stellar-ledger-entries.x b/xdr/Stellar-ledger-entries.x
@@ -11,7 +11,7 @@ typedef PublicKey AccountID;
 typedef opaque Thresholds[4];
 typedef string string32<32>;
 typedef string string64<64>;
-typedef uint64 SequenceNumber;
+typedef int64 SequenceNumber;
 typedef opaque DataValue<64>; 
 
 enum AssetType
diff --git a/xdr/Stellar-ledger.x b/xdr/Stellar-ledger.x
@@ -265,9 +265,19 @@ struct OperationMeta
     LedgerEntryChanges changes;
 };
 
+struct TransactionMetaV1
+{
+    LedgerEntryChanges txChanges; // tx level changes if any
+    OperationMeta operations<>; // meta for each operation
+};
+
+// this is the meta produced when applying transactions
+// it does not include pre-apply updates such as fees
 union TransactionMeta switch (int v)
 {
 case 0:
     OperationMeta operations<>;
+case 1:
+    TransactionMetaV1 v1;
 };
 }
diff --git a/xdr/Stellar-overlay.x b/xdr/Stellar-overlay.x
@@ -112,7 +112,7 @@ case DONT_HAVE:
 case GET_PEERS:
     void;
 case PEERS:
-    PeerAddress peers<>;
+    PeerAddress peers<100>;
 
 case GET_TX_SET:
     uint256 txSetHash;
diff --git a/xdr/Stellar-transaction.x b/xdr/Stellar-transaction.x

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`# ALLOW_TRUST_NO_TRUST_LINE = -2, // trustor does not have a trustline`
`15`	`15`	`# // source account does not require trust`
`16`	`16`	`# ALLOW_TRUST_TRUST_NOT_REQUIRED = -3,`
`17`		`-# ALLOW_TRUST_CANT_REVOKE = -4, // source account can't revoke trust,`
	`17`	`+# ALLOW_TRUST_CANT_REVOKE = -4, // source account can't revoke trust,`
`18`	`18`	`# ALLOW_TRUST_SELF_NOT_ALLOWED = -5 // trusting self is not allowed`
`19`	`19`	`# };`
`20`	`20`	`#`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`#`
`8`	`8`	`# struct ManageDataOp`
`9`	`9`	`# {`
`10`		`-# string64 dataName;`
`11`		`-# DataValue* dataValue; // set to null to clear`
	`10`	`+# string64 dataName;`
	`11`	`+# DataValue* dataValue; // set to null to clear`
`12`	`12`	`# };`
`13`	`13`	`#`
`14`	`14`	`# ===========================================================================`