From ce4b2b93a5e3e7ad515c2a9f028067736fb93ed1 Mon Sep 17 00:00:00 2001 From: anighanta Date: Sat, 3 Jul 2021 05:59:36 -0500 Subject: [PATCH 1/4] added response codes for if we a denominatig token type is a NFT and one for when and NFT has a fractional fee in its feeSchedule Signed-off-by: anighanta --- src/main/proto/ResponseCode.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/proto/ResponseCode.proto b/src/main/proto/ResponseCode.proto index 8793f21a..f2f078fc 100644 --- a/src/main/proto/ResponseCode.proto +++ b/src/main/proto/ResponseCode.proto @@ -254,4 +254,6 @@ enum ResponseCodeEnum { INVALID_CUSTOM_FRACTIONAL_FEES_SUM = 242; // The sum of all custom fractional fees must be strictly less than 1 FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at least its minimum_amount CUSTOM_SCHEDULE_ALREADY_HAS_NO_FEES = 244; // A fee schedule update tried to clear the custom fees from a token whose fee schedule was already empty + CUSTOM_FEE_DENOMINATION_MUST_BE_FUNGIBLE_COMMON = 245; // If a fee schedule denomination is a token, it must be a Fungible Token + CUSTOM_FRACTIONAL_FEE_ONLY_ALLOWED_FOR_FUNGIBLE_COMMON = 246; // A Non Fungible Token cannot have a fraction fee in its FeeSchedule } From 1ba315589c0d2473375ee83193be98cff814c870 Mon Sep 17 00:00:00 2001 From: ljianghedera Date: Mon, 5 Jul 2021 23:42:10 -0500 Subject: [PATCH 2/4] Added INVALID_CUSTOM_FEE_SCHEDULE_KEY code. Signed-off-by: ljianghedera --- src/main/proto/ResponseCode.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/proto/ResponseCode.proto b/src/main/proto/ResponseCode.proto index f2f078fc..6e373b72 100644 --- a/src/main/proto/ResponseCode.proto +++ b/src/main/proto/ResponseCode.proto @@ -252,8 +252,9 @@ enum ResponseCodeEnum { TOKEN_HAS_NO_FEE_SCHEDULE_KEY = 240; // Fee schedule key is not set on token CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE = 241; // A fractional custom fee exceeded the range of a 64-bit signed integer INVALID_CUSTOM_FRACTIONAL_FEES_SUM = 242; // The sum of all custom fractional fees must be strictly less than 1 - FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at least its minimum_amount + FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at leastg its minimum_amount CUSTOM_SCHEDULE_ALREADY_HAS_NO_FEES = 244; // A fee schedule update tried to clear the custom fees from a token whose fee schedule was already empty CUSTOM_FEE_DENOMINATION_MUST_BE_FUNGIBLE_COMMON = 245; // If a fee schedule denomination is a token, it must be a Fungible Token CUSTOM_FRACTIONAL_FEE_ONLY_ALLOWED_FOR_FUNGIBLE_COMMON = 246; // A Non Fungible Token cannot have a fraction fee in its FeeSchedule + INVALID_CUSTOM_FEE_SCHEDULE_KEY = 247; // The provided custom fee schedule key was invalid. } From f5566229f13ca57a3249ad3be2178f6eb4ee42a8 Mon Sep 17 00:00:00 2001 From: Quan Nguyen Date: Tue, 6 Jul 2021 11:41:31 -0500 Subject: [PATCH 3/4] Fix typo. Signed-off-by: Quan Nguyen --- src/main/proto/ResponseCode.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/proto/ResponseCode.proto b/src/main/proto/ResponseCode.proto index 6e373b72..a265575a 100644 --- a/src/main/proto/ResponseCode.proto +++ b/src/main/proto/ResponseCode.proto @@ -252,7 +252,7 @@ enum ResponseCodeEnum { TOKEN_HAS_NO_FEE_SCHEDULE_KEY = 240; // Fee schedule key is not set on token CUSTOM_FEE_OUTSIDE_NUMERIC_RANGE = 241; // A fractional custom fee exceeded the range of a 64-bit signed integer INVALID_CUSTOM_FRACTIONAL_FEES_SUM = 242; // The sum of all custom fractional fees must be strictly less than 1 - FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at leastg its minimum_amount + FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at least its minimum_amount CUSTOM_SCHEDULE_ALREADY_HAS_NO_FEES = 244; // A fee schedule update tried to clear the custom fees from a token whose fee schedule was already empty CUSTOM_FEE_DENOMINATION_MUST_BE_FUNGIBLE_COMMON = 245; // If a fee schedule denomination is a token, it must be a Fungible Token CUSTOM_FRACTIONAL_FEE_ONLY_ALLOWED_FOR_FUNGIBLE_COMMON = 246; // A Non Fungible Token cannot have a fraction fee in its FeeSchedule From 30ca335ffdb1bf5711faaa2a5636146a6ed6c474 Mon Sep 17 00:00:00 2001 From: Quan Nguyen Date: Tue, 6 Jul 2021 11:43:38 -0500 Subject: [PATCH 4/4] Update from upstream. Signed-off-by: Quan Nguyen --- src/main/proto/ResponseCode.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/proto/ResponseCode.proto b/src/main/proto/ResponseCode.proto index a265575a..21148110 100644 --- a/src/main/proto/ResponseCode.proto +++ b/src/main/proto/ResponseCode.proto @@ -254,7 +254,7 @@ enum ResponseCodeEnum { INVALID_CUSTOM_FRACTIONAL_FEES_SUM = 242; // The sum of all custom fractional fees must be strictly less than 1 FRACTIONAL_FEE_MAX_AMOUNT_LESS_THAN_MIN_AMOUNT = 243; // Each fractional custom fee must have its maximum_amount, if specified, at least its minimum_amount CUSTOM_SCHEDULE_ALREADY_HAS_NO_FEES = 244; // A fee schedule update tried to clear the custom fees from a token whose fee schedule was already empty - CUSTOM_FEE_DENOMINATION_MUST_BE_FUNGIBLE_COMMON = 245; // If a fee schedule denomination is a token, it must be a Fungible Token - CUSTOM_FRACTIONAL_FEE_ONLY_ALLOWED_FOR_FUNGIBLE_COMMON = 246; // A Non Fungible Token cannot have a fraction fee in its FeeSchedule - INVALID_CUSTOM_FEE_SCHEDULE_KEY = 247; // The provided custom fee schedule key was invalid. + CUSTOM_FEE_DENOMINATION_MUST_BE_FUNGIBLE_COMMON = 245; // Only tokens of type FUNGIBLE_COMMON can be used to as fee schedule denominations + CUSTOM_FRACTIONAL_FEE_ONLY_ALLOWED_FOR_FUNGIBLE_COMMON = 246; // Only tokens of type FUNGIBLE_COMMON can have fractional fees + INVALID_CUSTOM_FEE_SCHEDULE_KEY = 247; // The provided custom fee schedule key was invalid }