feat: update market contract value

Pandulis · Jul 23, 2020 · e436a3d · e436a3d
1 parent 27d2dc4
commit e436a3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java b/actuator/src/main/java/org/tron/core/utils/ProposalUtil.java
@@ -414,9 +414,9 @@ public enum ProposalType {         // current value, value range
     FORBID_TRANSFER_TO_CONTRACT(35), // 1, {0, 1}
     ALLOW_SHIELDED_TRC20_TRANSACTION(39), // 1, 39
     ALLOW_PBFT(40),// 1,40
-    ALLOW_MARKET_TRANSACTION(41), // todo
-    MARKET_SELL_FEE(42), // TODO
-    MARKET_CANCEL_FEE(43); // TODO
+    ALLOW_MARKET_TRANSACTION(41), // {0, 1}
+    MARKET_SELL_FEE(42), // 0 [0,10_000_000_000]
+    MARKET_CANCEL_FEE(43); // 0 [0,10_000_000_000]
 
     private long code;
 

diff --git a/framework/src/main/java/org/tron/core/consensus/ProposalService.java b/framework/src/main/java/org/tron/core/consensus/ProposalService.java
@@ -205,8 +205,8 @@ public static boolean process(Manager manager, ProposalCapsule proposalCapsule)
         case ALLOW_MARKET_TRANSACTION: {
           if (manager.getDynamicPropertiesStore().getAllowMarketTransaction() == 0) {
             manager.getDynamicPropertiesStore().saveAllowMarketTransaction(entry.getValue());
-            manager.getDynamicPropertiesStore().addSystemContractAndSetPermission(60);
-            manager.getDynamicPropertiesStore().addSystemContractAndSetPermission(61);
+            manager.getDynamicPropertiesStore().addSystemContractAndSetPermission(52);
+            manager.getDynamicPropertiesStore().addSystemContractAndSetPermission(53);
           }
           break;
         }

diff --git a/protocol/src/main/protos/core/Tron.proto b/protocol/src/main/protos/core/Tron.proto
@@ -340,8 +340,8 @@ message Transaction {
       ClearABIContract = 48;
       UpdateBrokerageContract = 49;
       ShieldedTransferContract = 51;
-      MarketSellAssetContract = 60;
-      MarketCancelOrderContract = 61;
+      MarketSellAssetContract = 52;
+      MarketCancelOrderContract = 53;
     }
     ContractType type = 1;
     google.protobuf.Any parameter = 2;