From fe128fa4f634044f6c52814e42d831f79bb59a1d Mon Sep 17 00:00:00 2001 From: Gregory Tsipenyuk Date: Wed, 9 Nov 2022 15:06:55 -0500 Subject: [PATCH] [FOLD] Resolve sfAsset/sfAsset2 fieldValue conflict with the sidechain PR. --- src/ripple/protocol/impl/SField.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp index 6b57d0d95bb..261af7182cf 100644 --- a/src/ripple/protocol/impl/SField.cpp +++ b/src/ripple/protocol/impl/SField.cpp @@ -302,8 +302,8 @@ CONSTRUCT_TYPED_SFIELD(sfNFTokenOffers, "NFTokenOffers", VECTOR25 CONSTRUCT_UNTYPED_SFIELD(sfPaths, "Paths", PATHSET, 1); // issue -CONSTRUCT_TYPED_SFIELD(sfAsset, "Asset", ISSUE, 1); -CONSTRUCT_TYPED_SFIELD(sfAsset2, "Asset2", ISSUE, 2); +CONSTRUCT_TYPED_SFIELD(sfAsset, "Asset", ISSUE, 3); +CONSTRUCT_TYPED_SFIELD(sfAsset2, "Asset2", ISSUE, 4); // inner object // OBJECT/1 is reserved for end of object