Merge pull request #6611 from ouy95917/implement-eip-7823

lvs0075 · web-flow · commit bb8b4be6fbbd · 2026-04-01T15:47:30.000+08:00
feat(vm): implement TIP-7823
diff --git a/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java b/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
@@ -871,6 +871,21 @@ public static void validator(DynamicPropertiesStore dynamicPropertiesStore,
         }
         break;
       }
+      case ALLOW_TVM_OSAKA: {
+        if (!forkController.pass(ForkBlockVersionEnum.VERSION_4_8_2)) {
+          throw new ContractValidateException(
+              "Bad chain parameter id [ALLOW_TVM_OSAKA]");
+        }
+        if (dynamicPropertiesStore.getAllowTvmOsaka() == 1) {
+          throw new ContractValidateException(
+              "[ALLOW_TVM_OSAKA] has been valid, no need to propose again");
+        }
+        if (value != 1) {
+          throw new ContractValidateException(
+              "This value[ALLOW_TVM_OSAKA] is only allowed to be 1");
+        }
+        break;
+      }
       default:
         break;
     }
@@ -955,7 +970,8 @@ public enum ProposalType {         // current value, value range
     CONSENSUS_LOGIC_OPTIMIZATION(88), // 0, 1
     ALLOW_TVM_BLOB(89), // 0, 1
     PROPOSAL_EXPIRE_TIME(92), // (0, 31536003000)
-    ALLOW_TVM_SELFDESTRUCT_RESTRICTION(94); // 0, 1
+    ALLOW_TVM_SELFDESTRUCT_RESTRICTION(94), // 0, 1
+    ALLOW_TVM_OSAKA(96); // 0, 1
 
     private long code;
 
diff --git a/actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java b/actuator/src/main/java/org/tron/core/vm/PrecompiledContracts.java
@@ -622,6 +622,8 @@ public static class ModExp extends PrecompiledContract {
 
     private static final int ARGS_OFFSET = 32 * 3; // addresses length part
 
+    private static final int UPPER_BOUND = 1024;
+
     @Override
     public long getEnergyForData(byte[] data) {
 
@@ -660,6 +662,11 @@ public Pair<Boolean, byte[]> execute(byte[] data) {
       int expLen = parseLen(data, 1);
       int modLen = parseLen(data, 2);
 
+      if (VMConfig.allowTvmOsaka()
+          && (baseLen > UPPER_BOUND || expLen > UPPER_BOUND || modLen > UPPER_BOUND)) {
+        return Pair.of(false, EMPTY_BYTE_ARRAY);
+      }
+
       BigInteger base = parseArg(data, ARGS_OFFSET, baseLen);
       BigInteger exp = parseArg(data, addSafely(ARGS_OFFSET, baseLen), expLen);
       BigInteger mod = parseArg(data, addSafely(addSafely(ARGS_OFFSET, baseLen), expLen), modLen);
diff --git a/actuator/src/main/java/org/tron/core/vm/config/ConfigLoader.java b/actuator/src/main/java/org/tron/core/vm/config/ConfigLoader.java
@@ -45,6 +45,7 @@ public static void load(StoreFactory storeFactory) {
         VMConfig.initDisableJavaLangMath(ds.getConsensusLogicOptimization());
         VMConfig.initAllowTvmBlob(ds.getAllowTvmBlob());
         VMConfig.initAllowTvmSelfdestructRestriction(ds.getAllowTvmSelfdestructRestriction());
+        VMConfig.initAllowTvmOsaka(ds.getAllowTvmOsaka());
       }
     }
   }
diff --git a/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java b/chainbase/src/main/java/org/tron/core/store/DynamicPropertiesStore.java
@@ -238,6 +238,8 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
   private static final byte[] ALLOW_TVM_SELFDESTRUCT_RESTRICTION =
       "ALLOW_TVM_SELFDESTRUCT_RESTRICTION".getBytes();
 
+  private static final byte[] ALLOW_TVM_OSAKA = "ALLOW_TVM_OSAKA".getBytes();
+
   @Autowired
   private DynamicPropertiesStore(@Value("properties") String dbName) {
     super(dbName);
@@ -2980,6 +2982,17 @@ public long getProposalExpireTime() {
         .orElse(CommonParameter.getInstance().getProposalExpireTime());
   }
 
+  public long getAllowTvmOsaka() {
+    return Optional.ofNullable(getUnchecked(ALLOW_TVM_OSAKA))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElse(CommonParameter.getInstance().getAllowTvmOsaka());
+  }
+
+  public void saveAllowTvmOsaka(long value) {
+    this.put(ALLOW_TVM_OSAKA, new BytesCapsule(ByteArray.fromLong(value)));
+  }
+
   private static class DynamicResourceProperties {
 
     private static final byte[] ONE_DAY_NET_LIMIT = "ONE_DAY_NET_LIMIT".getBytes();
diff --git a/common/src/main/java/org/tron/common/parameter/CommonParameter.java b/common/src/main/java/org/tron/common/parameter/CommonParameter.java
@@ -633,6 +633,10 @@ public class CommonParameter {
   @Setter
   public long allowTvmBlob;
 
+  @Getter
+  @Setter
+  public long allowTvmOsaka;
+
   private static double calcMaxTimeRatio() {
     return 5.0;
   }
diff --git a/common/src/main/java/org/tron/core/config/Parameter.java b/common/src/main/java/org/tron/core/config/Parameter.java
@@ -28,7 +28,8 @@ public enum ForkBlockVersionEnum {
     VERSION_4_7_7(31, 1596780000000L, 80),
     VERSION_4_8_0(32, 1596780000000L, 80),
     VERSION_4_8_0_1(33, 1596780000000L, 70),
-    VERSION_4_8_1(34, 1596780000000L, 80);
+    VERSION_4_8_1(34, 1596780000000L, 80),
+    VERSION_4_8_2(35, 1596780000000L, 80);
     // if add a version, modify BLOCK_VERSION simultaneously
 
     @Getter
@@ -77,7 +78,7 @@ public class ChainConstant {
     public static final int SINGLE_REPEAT = 1;
     public static final int BLOCK_FILLED_SLOTS_NUMBER = 128;
     public static final int MAX_FROZEN_NUMBER = 1;
-    public static final int BLOCK_VERSION = 34;
+    public static final int BLOCK_VERSION = 35;
     public static final long FROZEN_PERIOD = 86_400_000L;
     public static final long DELEGATE_PERIOD = 3 * 86_400_000L;
     public static final long TRX_PRECISION = 1000_000L;
diff --git a/common/src/main/java/org/tron/core/vm/config/VMConfig.java b/common/src/main/java/org/tron/core/vm/config/VMConfig.java
@@ -61,6 +61,8 @@ public class VMConfig {
 
   private static boolean ALLOW_TVM_SELFDESTRUCT_RESTRICTION = false;
 
+  private static boolean ALLOW_TVM_OSAKA = false;
+
   private VMConfig() {
   }
 
@@ -172,6 +174,10 @@ public static void initAllowTvmSelfdestructRestriction(long allow) {
     ALLOW_TVM_SELFDESTRUCT_RESTRICTION = allow == 1;
   }
 
+  public static void initAllowTvmOsaka(long allow) {
+    ALLOW_TVM_OSAKA = allow == 1;
+  }
+
   public static boolean getEnergyLimitHardFork() {
     return CommonParameter.ENERGY_LIMIT_HARD_FORK;
   }
@@ -271,4 +277,8 @@ public static boolean allowTvmBlob() {
   public static boolean allowTvmSelfdestructRestriction() {
     return ALLOW_TVM_SELFDESTRUCT_RESTRICTION;
   }
+
+  public static boolean allowTvmOsaka() {
+    return ALLOW_TVM_OSAKA;
+  }
 }
diff --git a/framework/src/main/java/org/tron/core/Wallet.java b/framework/src/main/java/org/tron/core/Wallet.java
@@ -1509,6 +1509,11 @@ public Protocol.ChainParameters getChainParameters() {
         .setValue(dbManager.getDynamicPropertiesStore().getProposalExpireTime())
         .build());
 
+    builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
+        .setKey("getAllowTvmOsaka")
+        .setValue(dbManager.getDynamicPropertiesStore().getAllowTvmOsaka())
+        .build());
+
     return builder.build();
   }
 
diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java
@@ -1037,6 +1037,10 @@ public static void applyConfigParams(
         config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) ? config
             .getInt(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) : 0;
 
+    PARAMETER.allowTvmOsaka =
+        config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) ? config
+            .getInt(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) : 0;
+
     logConfig();
   }
 
diff --git a/framework/src/main/java/org/tron/core/config/args/ConfigKey.java b/framework/src/main/java/org/tron/core/config/args/ConfigKey.java
@@ -247,6 +247,7 @@ private ConfigKey() {
   public static final String COMMITTEE_ALLOW_TVM_CANCUN = "committee.allowTvmCancun";
   public static final String COMMITTEE_ALLOW_TVM_BLOB = "committee.allowTvmBlob";
   public static final String COMMITTEE_PROPOSAL_EXPIRE_TIME = "committee.proposalExpireTime";
+  public static final String COMMITTEE_ALLOW_TVM_OSAKA = "committee.allowTvmOsaka";
   public static final String ALLOW_ACCOUNT_ASSET_OPTIMIZATION =
       "committee.allowAccountAssetOptimization";
   public static final String ALLOW_ASSET_OPTIMIZATION = "committee.allowAssetOptimization";
diff --git a/framework/src/main/java/org/tron/core/consensus/ProposalService.java b/framework/src/main/java/org/tron/core/consensus/ProposalService.java
@@ -392,6 +392,10 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
           manager.getDynamicPropertiesStore().saveProposalExpireTime(entry.getValue());
           break;
         }
+        case ALLOW_TVM_OSAKA: {
+          manager.getDynamicPropertiesStore().saveAllowTvmOsaka(entry.getValue());
+          break;
+        }
         default:
           find = false;
           break;
diff --git a/framework/src/main/resources/config.conf b/framework/src/main/resources/config.conf
@@ -759,6 +759,7 @@ committee = {
   # allowTvmBlob = 0
   # consensusLogicOptimization = 0
   # allowOptimizedReturnValueOfChainId = 0
+  # allowTvmOsaka = 0
 }
 
 event.subscribe = {
diff --git a/framework/src/test/java/org/tron/common/runtime/vm/AllowTvmOsakaTest.java b/framework/src/test/java/org/tron/common/runtime/vm/AllowTvmOsakaTest.java
@@ -0,0 +1,77 @@
+package org.tron.common.runtime.vm;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
+import org.junit.Assert;
+import org.junit.Test;
+import org.tron.common.utils.ByteUtil;
+import org.tron.core.vm.PrecompiledContracts;
+import org.tron.core.vm.config.ConfigLoader;
+import org.tron.core.vm.config.VMConfig;
+
+@Slf4j
+public class AllowTvmOsakaTest extends VMTestBase {
+
+  private static final PrecompiledContracts.PrecompiledContract modExp =
+      new PrecompiledContracts.ModExp();
+
+  private static byte[] toLenBytes(int value) {
+    byte[] b = new byte[32];
+    b[28] = (byte) ((value >> 24) & 0xFF);
+    b[29] = (byte) ((value >> 16) & 0xFF);
+    b[30] = (byte) ((value >> 8) & 0xFF);
+    b[31] = (byte) (value & 0xFF);
+    return b;
+  }
+
+  @Test
+  public void testEIP7823() {
+    ConfigLoader.disable = true;
+    VMConfig.initAllowTvmOsaka(1);
+
+    try {
+      // all-zero lengths: should succeed
+      Pair<Boolean, byte[]> result = modExp.execute(
+          ByteUtil.merge(toLenBytes(0), toLenBytes(0), toLenBytes(0)));
+      Assert.assertTrue(result.getLeft());
+
+      // baseLen == 1024: boundary, should succeed
+      result = modExp.execute(
+          ByteUtil.merge(toLenBytes(1024), toLenBytes(0), toLenBytes(0)));
+      Assert.assertTrue(result.getLeft());
+
+      // baseLen == 1025: just over the limit, should fail
+      result = modExp.execute(
+          ByteUtil.merge(toLenBytes(1025), toLenBytes(0), toLenBytes(0)));
+      Assert.assertFalse(result.getLeft());
+
+      // oversized expLen only: should fail
+      result = modExp.execute(
+          ByteUtil.merge(toLenBytes(0), toLenBytes(1025), toLenBytes(0)));
+      Assert.assertFalse(result.getLeft());
+
+      // oversized modLen only: should fail
+      result = modExp.execute(
+          ByteUtil.merge(toLenBytes(0), toLenBytes(0), toLenBytes(1025)));
+      Assert.assertFalse(result.getLeft());
+    } finally {
+      VMConfig.initAllowTvmOsaka(0);
+      ConfigLoader.disable = false;
+    }
+  }
+
+  @Test
+  public void testEIP7823DisabledShouldPass() {
+    ConfigLoader.disable = true;
+    VMConfig.initAllowTvmOsaka(0);
+
+    try {
+      // all limits exceeded while osaka is disabled: should succeed (no restriction)
+      Pair<Boolean, byte[]> result = modExp.execute(
+          ByteUtil.merge(toLenBytes(2048), toLenBytes(2048), toLenBytes(2048)));
+      Assert.assertTrue(result.getLeft());
+    } finally {
+      ConfigLoader.disable = false;
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ public static void load(StoreFactory storeFactory) {`
`45`	`45`	`VMConfig.initDisableJavaLangMath(ds.getConsensusLogicOptimization());`
`46`	`46`	`VMConfig.initAllowTvmBlob(ds.getAllowTvmBlob());`
`47`	`47`	`VMConfig.initAllowTvmSelfdestructRestriction(ds.getAllowTvmSelfdestructRestriction());`
	`48`	`+ VMConfig.initAllowTvmOsaka(ds.getAllowTvmOsaka());`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ public class VMConfig {`
`61`	`61`
`62`	`62`	`private static boolean ALLOW_TVM_SELFDESTRUCT_RESTRICTION = false;`
`63`	`63`
	`64`	`+ private static boolean ALLOW_TVM_OSAKA = false;`
	`65`	`+`
`64`	`66`	`private VMConfig() {`
`65`	`67`	`}`
`66`	`68`
`@@ -172,6 +174,10 @@ public static void initAllowTvmSelfdestructRestriction(long allow) {`
`172`	`174`	`ALLOW_TVM_SELFDESTRUCT_RESTRICTION = allow == 1;`
`173`	`175`	`}`
`174`	`176`
	`177`	`+ public static void initAllowTvmOsaka(long allow) {`
	`178`	`+ ALLOW_TVM_OSAKA = allow == 1;`
	`179`	`+ }`
	`180`	`+`
`175`	`181`	`public static boolean getEnergyLimitHardFork() {`
`176`	`182`	`return CommonParameter.ENERGY_LIMIT_HARD_FORK;`
`177`	`183`	`}`
`@@ -271,4 +277,8 @@ public static boolean allowTvmBlob() {`
`271`	`277`	`public static boolean allowTvmSelfdestructRestriction() {`
`272`	`278`	`return ALLOW_TVM_SELFDESTRUCT_RESTRICTION;`
`273`	`279`	`}`
	`280`	`+`
	`281`	`+ public static boolean allowTvmOsaka() {`
	`282`	`+ return ALLOW_TVM_OSAKA;`
	`283`	`+ }`
`274`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1037,6 +1037,10 @@ public static void applyConfigParams(`
`1037`	`1037`	`config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) ? config`
`1038`	`1038`	`.getInt(ConfigKey.COMMITTEE_ALLOW_TVM_BLOB) : 0;`
`1039`	`1039`
	`1040`	`+ PARAMETER.allowTvmOsaka =`
	`1041`	`+ config.hasPath(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) ? config`
	`1042`	`+ .getInt(ConfigKey.COMMITTEE_ALLOW_TVM_OSAKA) : 0;`
	`1043`	`+`
`1040`	`1044`	`logConfig();`
`1041`	`1045`	`}`
`1042`	`1046`