Support typed transaction

icon-project · Aug 16, 2023 · 32433bd · 32433bd
1 parent 1992706
commit 32433bd
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 2 deletions.
diff --git a/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Receipt.java b/bmv/bsc2/src/main/java/foundation/icon/btp/bmv/bsc2/Receipt.java
@@ -21,10 +21,13 @@
 import scorex.util.Collections;
 
 import java.math.BigInteger;
+import java.util.Arrays;
 import java.util.List;
 
 public class Receipt {
     public static final int StatusFailed = 0;
+    private static final int AccessListTx = 1;
+    private static final int DynamicFeeTx = 2;
     private final byte[] postStatusOrState;
     private final List<EventLog> logs;
 
@@ -35,7 +38,6 @@ public Receipt(byte[] postStatusOrState,
     }
 
     public static Receipt readObject(ObjectReader r) {
-        // TODO supports to decoding typed-receipt
         r.beginList();
         byte[] postStatusOrState = r.readByteArray();
         r.readBigInteger();
@@ -51,7 +53,18 @@ public static Receipt readObject(ObjectReader r) {
     }
 
     public static Receipt fromBytes(byte[] bytes) {
-        return Receipt.readObject(Context.newByteArrayObjectReader("RLP", bytes));
+        Context.require(bytes.length > 0, "Invalid receipt bytes");
+
+        // legacy transaction
+        if ((bytes[0] & 0xff) > 0x7f) {
+            return Receipt.readObject(Context.newByteArrayObjectReader("RLP", bytes));
+        }
+
+        // typed transaction
+        Context.require(bytes[0] == AccessListTx || bytes[0] == DynamicFeeTx,
+                "Unsupported typed transaction");
+        return Receipt.readObject(Context.newByteArrayObjectReader("RLP",
+                Arrays.copyOfRange(bytes, 1, bytes.length)));
     }
 
     public int getStatus() {

diff --git a/bmv/bsc2/src/test/resources/testnet.json b/bmv/bsc2/src/test/resources/testnet.json