Release v4.1.1 (#3492)

* refine code

* optimize tvm release4.1

* remove unit test for proposal Stake and AssetIssue

* remove unnecessary code

* remove useless chainParameter

Co-authored-by: taihaofu <[email protected]>
Co-authored-by: xiangdepeng <[email protected]>
Co-authored-by: jeancky <[email protected]>

Author: 4 people

actuator/src/main/java/org/tron/core/vm/OpCode.java

@@ -585,20 +585,6 @@ public enum OpCode {
   CALLTOKENID(0xd3, 0, 1, OpCode.Tier.BaseTier),
 
   ISCONTRACT(0xd4, 1, 1, OpCode.Tier.ExtTier),
-
-  STAKE(0xd5, 2, 1, OpCode.Tier.ExtTier),
-
-  UNSTAKE(0xd6, 0, 1, OpCode.Tier.ExtTier),
-
-  WITHDRAWREWARD(0xd7, 1, 1, OpCode.Tier.ExtTier),
-
-  REWARDBALANCE(0xd8, 1, 1, OpCode.Tier.ExtTier),
-
-  ISSRCANDIDATE(0xd9, 1, 1, OpCode.Tier.ExtTier),
-
-  TOKENISSUE(0xda, 1, 1, Tier.HighTier),
-
-  UPDATEASSET(0xdb, 1, 1, OpCode.Tier.HighTier),
   /**
    * (0xf0) Create a new account with associated code
    */

actuator/src/main/java/org/tron/core/vm/VM.java

@@ -92,36 +92,15 @@ public void step(Program program) {
 
     try {
       OpCode op = OpCode.code(program.getCurrentOp());
-      if (op == null) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      // hard fork for 3.2
-      if (!VMConfig.allowTvmTransferTrc10()
-          && (op == CALLTOKEN || op == TOKENBALANCE || op == CALLTOKENVALUE || op == CALLTOKENID)) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      if (!VMConfig.allowTvmConstantinople()
-          && (op == SHL || op == SHR || op == SAR || op == CREATE2 || op == EXTCODEHASH)) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      if (!VMConfig.allowTvmSolidity059() && op == ISCONTRACT) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      if (!VMConfig.allowTvmIstanbul() && (op == SELFBALANCE || op == CHAINID)) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      if (!VMConfig.allowTvmStake()
-              && (op == ISSRCANDIDATE || op == REWARDBALANCE || op == STAKE || op == UNSTAKE
-                || op == WITHDRAWREWARD)) {
-        throw Program.Exception.invalidOpCode(program.getCurrentOp());
-      }
-
-      if(!VMConfig.allowTvmAssetIssue() && (op == TOKENISSUE || op == UPDATEASSET)) {
+      if (op == null
+          || (!VMConfig.allowTvmTransferTrc10()
+              && (op == CALLTOKEN || op == TOKENBALANCE || op == CALLTOKENVALUE
+          || op == CALLTOKENID))
+          || (!VMConfig.allowTvmConstantinople()
+              && (op == SHL || op == SHR || op == SAR || op == CREATE2 || op == EXTCODEHASH))
+          || (!VMConfig.allowTvmSolidity059() && op == ISCONTRACT)
+          || (!VMConfig.allowTvmIstanbul() && (op == SELFBALANCE || op == CHAINID))
+          ) {
         throw Program.Exception.invalidOpCode(program.getCurrentOp());
       }
 
@@ -173,9 +152,7 @@ public void step(Program program) {
           break;
         case TOKENBALANCE:
         case BALANCE:
-        case REWARDBALANCE:
         case ISCONTRACT:
-        case ISSRCANDIDATE:
           energyCost = energyCosts.getBALANCE();
           break;
 
@@ -317,19 +294,6 @@ && isDeadAccount(program, callAddressWord)
           energyCost =
               (long) energyCosts.getEXP_ENERGY() + energyCosts.getEXP_BYTE_ENERGY() * bytesOccupied;
           break;
-        case STAKE:
-        case UNSTAKE:
-          energyCost = energyCosts.getStakeAndUnstake();
-          break;
-        case WITHDRAWREWARD:
-          energyCost = energyCosts.getWithdrawReward();
-          break;
-        case TOKENISSUE:
-          energyCost = energyCosts.getTokenIssue();
-          break;
-        case UPDATEASSET:
-          energyCost = energyCosts.getUpdateAsset();
-          break;
         default:
           break;
       }
@@ -763,20 +727,6 @@ && isDeadAccount(program, callAddressWord)
           program.step();
         }
         break;
-        case REWARDBALANCE: {
-          DataWord address = program.stackPop();
-          DataWord rewardBalance = program.getRewardBalance(address);
-
-          if (logger.isDebugEnabled()) {
-            hint = ADDRESS_LOG
-                    + Hex.toHexString(address.getLast20Bytes())
-                    + " reward balance: " + rewardBalance.toString();
-          }
-
-          program.stackPush(rewardBalance);
-          program.step();
-        }
-        break;
         case ISCONTRACT: {
           DataWord address = program.stackPop();
           DataWord isContract = program.isContract(address);
@@ -785,14 +735,6 @@ && isDeadAccount(program, callAddressWord)
           program.step();
         }
         break;
-        case ISSRCANDIDATE: {
-          DataWord address = program.stackPop();
-          DataWord isSRCandidate = program.isSRCandidate(address);
-
-          program.stackPush(isSRCandidate);
-          program.step();
-        }
-        break;
         case ORIGIN: {
           DataWord originAddress = program.getOriginAddress();
 
@@ -1452,46 +1394,6 @@ && isDeadAccount(program, callAddressWord)
           program.step();
           break;
         }
-        case STAKE: {
-          DataWord srAddress = program.stackPop();
-          DataWord stakeAmount = program.stackPop();
-          boolean result = program.stake(srAddress, stakeAmount);
-          program.stackPush(new DataWord(result ? 1 : 0));
-
-          program.step();
-        }
-        break;
-        case UNSTAKE: {
-          boolean result = program.unstake();
-          program.stackPush(new DataWord(result ? 1 : 0));
-
-          program.step();
-        }
-        break;
-        case WITHDRAWREWARD: {
-          program.withdrawReward();
-          program.step();
-        }
-        break;
-        case TOKENISSUE: {
-          DataWord name = program.stackPop();
-          DataWord abbr = program.stackPop();
-          DataWord totalSupply = program.stackPop();
-          DataWord precision = program.stackPop();
-
-          program.tokenIssue(name, abbr, totalSupply, precision);
-          program.step();
-          break;
-        }
-        case UPDATEASSET: {
-          program.stackPop();
-          DataWord urlDataOffs = program.stackPop();
-          DataWord descriptionDataOffs = program.stackPop();
-
-          program.updateAsset(urlDataOffs, descriptionDataOffs);
-          program.step();
-          break;
-        }
         case RETURN:
         case REVERT: {
           DataWord offset = program.stackPop();

framework/src/main/java/org/tron/core/Wallet.java

@@ -973,15 +973,15 @@ public Protocol.ChainParameters getChainParameters() {
         .setValue(dbManager.getDynamicPropertiesStore().getAllowPBFT())
         .build());
 
-    builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
-        .setKey("getAllowTvmStake")
-        .setValue(dbManager.getDynamicPropertiesStore().getAllowTvmStake())
-        .build());
-
-    builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
-            .setKey("getAllowTvmAssetIssue")
-            .setValue(dbManager.getDynamicPropertiesStore().getAllowTvmAssetIssue())
-            .build());
+    //builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
+    //    .setKey("getAllowTvmStake")
+    //    .setValue(dbManager.getDynamicPropertiesStore().getAllowTvmStake())
+    //    .build());
+
+    //builder.addChainParameter(Protocol.ChainParameters.ChainParameter.newBuilder()
+    //        .setKey("getAllowTvmAssetIssue")
+    //        .setValue(dbManager.getDynamicPropertiesStore().getAllowTvmAssetIssue())
+    //        .build());
 
     return builder.build();
   }