Set gas cost for new Bridge methods to get/set super/base events info

Author: marcos-iov

rskj-core/src/main/java/co/rsk/peg/BridgeMethods.java

@@ -32,7 +32,6 @@
 import org.ethereum.config.blockchain.upgrades.ActivationConfig;
 import org.ethereum.core.CallTransaction;
 import org.ethereum.db.ByteArrayWrapper;
-import org.ethereum.solidity.SolidityType;
 import org.ethereum.vm.MessageCall.MsgType;
 
 /**
@@ -131,7 +130,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "getBtcBlockchainBestChainHeight",
             new String[]{},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(19000L),
         (BridgeMethodExecutorTyped<Integer>) Bridge::getBtcBlockchainBestChainHeight,
@@ -142,7 +141,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "getBtcBlockchainInitialBlockHeight",
             new String[]{},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(20000L),
         (BridgeMethodExecutorTyped<Integer>) Bridge::getBtcBlockchainInitialBlockHeight,
@@ -325,7 +324,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "getMinimumLockTxValue",
             new String[]{},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(2000L),
         (BridgeMethodExecutorTyped<Long>) Bridge::getMinimumLockTxValue,
@@ -637,7 +636,7 @@ public enum BridgeMethods {
     REGISTER_BTC_TRANSACTION(
         CallTransaction.Function.fromSignature(
             "registerBtcTransaction",
-            new String[]{BYTES, "int", BYTES},
+            new String[]{BYTES, INT, BYTES},
             new String[]{}
         ),
         fixedCost(22000L),
@@ -831,7 +830,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "setUnionBridgeContractAddressForTestnet",
             new String[]{ADDRESS},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(8_000L),
         Bridge.executeIfTestnetAndAuthorized(
@@ -870,7 +869,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "increaseUnionBridgeLockingCap",
             new String[]{UINT256},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(8_000L),
         Bridge.executeIfAuthorized(
@@ -885,7 +884,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "requestUnionBridgeRbtc",
             new String[]{UINT256},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(8_000L),
         (BridgeMethodExecutorTyped<Integer>) Bridge::requestUnionBridgeRbtc,
@@ -896,7 +895,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "releaseUnionBridgeRbtc",
             new String[]{},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(8_000L),
         (BridgeMethodExecutorTyped<Integer>) Bridge::releaseUnionBridgeRbtc,
@@ -907,7 +906,7 @@ public enum BridgeMethods {
         CallTransaction.Function.fromSignature(
             "setUnionBridgeTransferPermissions",
             new String[]{BOOL, BOOL},
-            new String[]{"int"}
+            new String[]{INT}
         ),
         fixedCost(8_000L),
         Bridge.executeIfAuthorized(
@@ -924,7 +923,7 @@ public enum BridgeMethods {
           new String[]{},
           new String[]{BYTES}
         ),
-        fixedCost(3_000L), // TODO define final cost
+        fixedCost(3_000L),
         (BridgeMethodExecutorTyped<byte[]>) Bridge::getSuperEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false),
@@ -936,7 +935,7 @@ public enum BridgeMethods {
             new String[]{BYTES},
             new String[]{}
         ),
-        fixedCost(8_000L), // TODO define final cost
+        fixedCost(8_000L),
         (BridgeMethodExecutorVoid) Bridge::setSuperEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false)
@@ -947,7 +946,7 @@ public enum BridgeMethods {
             new String[]{},
             new String[]{}
         ),
-        fixedCost(8_000L), // TODO define final cost
+        fixedCost(8_000L),
         (BridgeMethodExecutorVoid) Bridge::clearSuperEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false)
@@ -958,7 +957,7 @@ public enum BridgeMethods {
             new String[]{},
             new String[]{BYTES}
         ),
-        fixedCost(3_000L), // TODO define final cost
+        fixedCost(3_000L),
         (BridgeMethodExecutorTyped<byte[]>) Bridge::getBaseEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false),
@@ -970,7 +969,7 @@ public enum BridgeMethods {
             new String[]{BYTES},
             new String[]{}
         ),
-        fixedCost(8_000L), // TODO define final cost
+        fixedCost(8_000L),
         (BridgeMethodExecutorVoid) Bridge::setBaseEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false)
@@ -981,7 +980,7 @@ public enum BridgeMethods {
             new String[]{},
             new String[]{}
         ),
-        fixedCost(8_000L), // TODO define final cost
+        fixedCost(8_000L),
         (BridgeMethodExecutorVoid) Bridge::clearBaseEvent,
         activations -> activations.isActive(RSKIP529),
         fixedPermission(false)
@@ -994,6 +993,12 @@ private static class CallTypeHelper {
         private static final Predicate<MsgType> RESTRICTED_TO_CALL =  callType -> callType == MsgType.CALL;
     }
 
+    private static final Map<ByteArrayWrapper, BridgeMethods> SIGNATURES = Stream.of(BridgeMethods.values())
+        .collect(Collectors.toMap(
+            m -> new ByteArrayWrapper(m.getFunction().encodeSignature()),
+            Function.identity()
+        ));
+
     private final CallTransaction.Function function;
     private final CostProvider costProvider;
     private final Function<ActivationConfig.ForBlock, Boolean> isEnabledFunction;
@@ -1186,10 +1191,4 @@ private static BridgeCallPermissionProvider fixedPermission(boolean onlyAllowsLo
     private static BridgeCallPermissionProvider fromMethod(BridgeCallPermissionProvider bridgeCallPermissionProvider) {
         return (Bridge bridge, Object[] args) -> bridgeCallPermissionProvider.getOnlyAllowLocalCallsPermission(bridge, args);
     }
-
-    private static final Map<ByteArrayWrapper, BridgeMethods> SIGNATURES = Stream.of(BridgeMethods.values())
-        .collect(Collectors.toMap(
-            m -> new ByteArrayWrapper(m.getFunction().encodeSignature()),
-            Function.identity()
-        ));
 }