From 7e4dd1ecb2b0328115f653d0ad985246a7d2b2c8 Mon Sep 17 00:00:00 2001
From: jiangyuanshu <317787106@qq.com>
Date: Thu, 11 Jan 2024 10:16:50 +0800
Subject: [PATCH 1/2] feat(log): catch ContractExeException in
 createShieldedContractParameters

---
 .../src/main/java/org/tron/core/services/RpcApiService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/org/tron/core/services/RpcApiService.java b/framework/src/main/java/org/tron/core/services/RpcApiService.java
index c5077facf6..85ad2dd18d 100755
--- a/framework/src/main/java/org/tron/core/services/RpcApiService.java
+++ b/framework/src/main/java/org/tron/core/services/RpcApiService.java
@@ -89,6 +89,7 @@
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.exception.BadItemException;
+import org.tron.core.exception.ContractExeException;
 import org.tron.core.exception.ContractValidateException;
 import org.tron.core.exception.ItemNotFoundException;
 import org.tron.core.exception.NonUniqueObjectException;
@@ -2475,7 +2476,7 @@ public void createShieldedContractParameters(
         ShieldedTRC20Parameters shieldedTRC20Parameters = wallet
             .createShieldedContractParameters(request);
         responseObserver.onNext(shieldedTRC20Parameters);
-      } catch (ZksnarkException | ContractValidateException e) {
+      } catch (ZksnarkException | ContractValidateException | ContractExeException e) {
         responseObserver.onError(getRunTimeException(e));
         logger.info("createShieldedContractParameters: {}", e.getMessage());
         return;

From 5ca502a43281eb22c1c439f2ce53d6d826f7370c Mon Sep 17 00:00:00 2001
From: jiangyuanshu <317787106@qq.com>
Date: Thu, 11 Jan 2024 11:15:44 +0800
Subject: [PATCH 2/2] feat(test): add testcase

---
 .../src/main/java/org/tron/core/db/Manager.java      |  1 +
 .../org/tron/core/capsule/utils/RLPListTest.java     | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java
index b0d902eb84..00af042bef 100644
--- a/framework/src/main/java/org/tron/core/db/Manager.java
+++ b/framework/src/main/java/org/tron/core/db/Manager.java
@@ -1843,6 +1843,7 @@ private void postSolidityLogContractTrigger(Long blockNum, Long lastSolidityNum)
         triggerCapsule.setTriggerName(Trigger.SOLIDITYLOG_TRIGGER_NAME);
         EventPluginLoader.getInstance().postSolidityLogTrigger(triggerCapsule);
       } else {
+        // when switch fork, block will be post to triggerCapsuleQueue, transaction may be not found
         logger.error("PostSolidityLogContractTrigger txId = {} not contains transaction.",
             triggerCapsule.getTransactionId());
       }
diff --git a/framework/src/test/java/org/tron/core/capsule/utils/RLPListTest.java b/framework/src/test/java/org/tron/core/capsule/utils/RLPListTest.java
index 7d90359196..160ecd8f6d 100644
--- a/framework/src/test/java/org/tron/core/capsule/utils/RLPListTest.java
+++ b/framework/src/test/java/org/tron/core/capsule/utils/RLPListTest.java
@@ -1,5 +1,7 @@
 package org.tron.core.capsule.utils;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -23,4 +25,14 @@ public void testGetRLPData() {
     Assert.assertEquals(new String(rlpList.getRLPData()), "rlpData");
   }
 
+  @Test
+  public void testToBytes()
+      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    Method method = RLP.class.getDeclaredMethod("toBytes", Object.class);
+    method.setAccessible(true);
+
+    byte[] aBytes = new byte[10];
+    byte[] bBytes = (byte[]) method.invoke(RLP.class, aBytes);
+    Assert.assertArrayEquals(aBytes, bBytes);
+  }
 }