Testing unit test

.circleci/config.yml

@@ -136,11 +136,18 @@ jobs:
       - *pull_klaytn_image
       - *start_test_network
       - *check_test_network
+      - run:
+          name: "Check environment"
+          command: java --version && gradle --version
       - run:
           name: "Test"
-          command: ./gradlew clean test --debug
+          command: ./gradlew clean test --debug --scan
       - store_test_results:
           path: core/build/test-results/test
+      - store_artifacts:
+          path: /home/circleci/circleci-caver-java-major/core/build/reports/tests/test
+          destination: test-output
+
 
   build_test:
     <<: *machine_ubuntu
@@ -195,6 +202,9 @@ jobs:
           command: ./gradlew connectedDebugAndroidTest --debug --stacktrace
       - store_test_results:
           path: android_instrumented_test/build/outputs/androidTest-results/connected
+      - store_artifacts:
+          path: android_instrumented_test/build/reports/androidTests/connected/flavors/debugAndroidTest
+          destination: /test-report
 
   build_test_android:
     <<: *android_machine_ubuntu

core/src/main/java/com/klaytn/caver/methods/response/ForkStatusResult.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022 The caver-java Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klaytn.caver.methods.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+import org.web3j.protocol.core.Response;
+
+public class ForkStatusResult
+  extends Response<ForkStatusResult.ForkStatusData> {
+
+	public static class ForkStatusData {
+
+		@JsonProperty("EthTxType")
+		private Boolean EthTxType;
+
+		@JsonProperty("Istanbul")
+		private Boolean Istanbul;
+
+		@JsonProperty("KIP103")
+		private Boolean KIP103;
+
+		@JsonProperty("Kore")
+		private Boolean Kore;
+
+		@JsonProperty("London")
+		private Boolean London;
+
+		@JsonProperty("Magma")
+		private Boolean Magma;
+
+		@JsonProperty("Mantle")
+		private Boolean Mantle;
+
+		public ForkStatusData() {}
+		public ForkStatusData (
+			Boolean EthTxType,
+			Boolean Istanbul,
+			Boolean KIP103,
+			Boolean Kore,
+			Boolean London,
+			Boolean Magma,
+			Boolean Mantle
+		) {
+			this.EthTxType = EthTxType;
+			this.Istanbul = Istanbul;
+			this.KIP103 = KIP103;
+			this.Kore = Kore;
+			this.London = London;
+			this.Magma = Magma;
+			this.Mantle = Mantle;
+		}
+	}
+}

core/src/main/java/com/klaytn/caver/methods/response/RewardsAccumulated.java

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2020 The caver-java Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the “License”);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an “AS IS” BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.klaytn.caver.methods.response;
+
+import java.util.Map;
+
+import org.web3j.protocol.core.Response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+public class RewardsAccumulated extends Response<RewardsAccumulated.RewardsAccumulatedData> {
+    public static class RewardsAccumulatedData {
+
+        @JsonProperty("firstBlockTime")
+        private String firstBlockTime;
+
+        @JsonProperty("lastBlockTime")
+        private String lastBlockTime;
+
+        @JsonProperty("firstBlock")
+        private String firstBlock;
+
+        @JsonProperty("lastBlock")
+        private String lastBlock;
+
+        @JsonProperty("totalMinted")
+        private String totalMinted;
+
+        @JsonProperty("totalTxFee")
+        private String totalTxFee;
+
+        @JsonProperty("totalBurntTxFee")
+        private String totalBurntTxFee;
+
+        @JsonProperty("totalProposerRewards")
+        private String totalProposerRewards;
+
+        @JsonProperty("totalStakingRewards")
+        private String totalStakingRewards;
+
+        @JsonProperty("totalKFFRewards")
+        private String totalKFFRewards;
+
+        @JsonProperty("totalKCFRewards")
+        private String totalKCFRewards;
+
+        /**
+         * mapping from reward recipient to amounts
+         */
+        @JsonProperty("rewards")
+        private Map<String, String> rewards;
+
+        public RewardsAccumulatedData() {}
+        public RewardsAccumulatedData(
+                String firstBlockTime,
+                String lastBlockTime,
+                String firstBlock,
+                String lastBlock,
+                String totalMinted,
+                String totalTxFee,
+                String totalBurntTxFee,
+                String totalProposerRewards,
+                String totalStakingRewards,
+                String totalKFFRewards,
+                String totalKCFRewards,
+                Map<String, String> Rewards
+        ) {
+            this.firstBlockTime = firstBlockTime;
+            this.lastBlockTime = lastBlockTime;
+            this.firstBlock = firstBlock;
+            this.lastBlock = lastBlock;
+            this.totalMinted = totalMinted;
+            this.totalTxFee = totalTxFee;
+            this.totalBurntTxFee = totalBurntTxFee;
+            this.totalProposerRewards = totalProposerRewards;
+            this.totalStakingRewards = totalStakingRewards;
+            this.totalKFFRewards = totalKFFRewards;
+            this.totalKCFRewards = totalKCFRewards;
+            this.rewards = rewards;
+        }
+    }
+}

core/src/main/java/com/klaytn/caver/rpc/Governance.java

@@ -278,7 +278,7 @@ public Request<?, GovernanceMyVotes> getMyVotes() {
      * @return Request&lt;?, GovernanceChainConfig&gt;
      */
     public Request<?, GovernanceChainConfig> getChainConfig() {
-        return getChainConfigAt(DefaultBlockParameterName.LATEST);
+        return getChainConfig(DefaultBlockParameterName.LATEST);
     }
 
     /**
@@ -330,44 +330,6 @@ public Request<?, GovernanceChainConfig> getChainConfig(DefaultBlockParameter bl
         );
     }
 
-    /**
-     * Provides the chain configuration at the specified block number
-     * <pre>Example :
-     * {@code
-     * GovernanceChainConfig response = caver.rpc.governance.getChainConfigAt(BigInteger.ZERO).send();
-     * }
-     * </pre>
-     * @return Request&lt;?, GovernanceChainConfig&gt;
-     */
-    public Request<?, GovernanceChainConfig> getChainConfigAt(BigInteger blockNumber) {
-        return getChainConfigAt(DefaultBlockParameter.valueOf(blockNumber));
-    }
-
-    /**
-     * Provides the chain configuration by block tag (latest, earliest, pending)
-     * <pre>Example :
-     * {@code
-     * GovernanceChainConfig response = caver.rpc.governance.getChainConfigAt("latest").send();
-     * }
-     * </pre>
-     * @return Request&lt;?, GovernanceChainConfig&gt;
-     */
-    public Request<?, GovernanceChainConfig> getChainConfigAt(String blockTag) {
-        return getChainConfigAt(DefaultBlockParameterName.fromString(blockTag));
-    }
-
-    /**
-     * return chain configuration   
-     */
-    public Request<?, GovernanceChainConfig> getChainConfigAt(DefaultBlockParameter blockNumberOrTag) {
-        return new Request<>(
-                "governance_chainConfigAt",
-                Arrays.asList(blockNumberOrTag),
-                provider,
-                GovernanceChainConfig.class
-        );
-    }
-
     /**
      * Provides the address of the node that a user is using.<p>
      * It is derived from the nodekey and used to sign consensus messages. And the value of "governingnode" has to be one of validator's node address.
@@ -467,59 +429,6 @@ Request<?, GovernanceItems> getParams(DefaultBlockParameter blockParameter) {
         );
     }
 
-    /**
-     * Returns governance items at specific block.<p>
-     * It is the result of previous voting of the block and used as configuration for chain at the given block number.<p>
-     * It pass the latest block tag as a parameter.
-     * <pre>Example :
-     * {@code
-     * GovernanceItems response = caver.rpc.governance.getItemsAt().send();
-     * Map<String, Object> governanceItem = response.getResult();
-     *
-     * String mode = IVote.VoteItem.getGovernanceMode(governanceItem);
-     * }</pre>
-     * @return Request&lt;?, Bytes20&gt;
-     */
-    public Request<?, GovernanceItems> getItemsAt() {
-        return getItemsAt(DefaultBlockParameterName.LATEST);
-    }
-
-    /**
-     * Returns governance items at specific block.<p>
-     * It is the result of previous voting of the block and used as configuration for chain at the given block number.
-     * <pre>Example :
-     * {@code
-     * GovernanceItems response = caver.rpc.governance.getItemsAt(BigInteger.ZERO).send();
-     * Map<String, Object> governanceItem = response.getResult();
-     *
-     * String mode = IVote.VoteItem.getGovernanceMode(governanceItem);
-     * }</pre>
-     * @param blockNumber The block number to query.
-     * @return Request&lt;?, GovernanceItems&gt;
-     */
-    public Request<?, GovernanceItems> getItemsAt(BigInteger blockNumber) {
-        return getItemsAt(DefaultBlockParameter.valueOf(blockNumber));
-    }
-
-    /**
-     * Returns governance items at specific block.<p>
-     * It is the result of previous voting of the block and used as configuration for chain at the given block number.
-     * <pre>Example :
-     * {@code
-     * GovernanceItems response = caver.rpc.governance.getItemsAt("latest").send();
-     * Map<String, Object> governanceItem = response.getResult();
-     *
-     * String mode = IVote.VoteItem.getGovernanceMode(governanceItem);
-     * }
-     * </pre>
-     * @param blockTag The block tag to query
-     * @return Request&lt;?, GovernanceItems&gt;
-     */
-    public Request<?, GovernanceItems> getItemsAt(String blockTag) {
-        DefaultBlockParameterName blockTagName = DefaultBlockParameterName.fromString(blockTag);
-        return getItemsAt(blockTagName);
-    }
-
     /**
      * Returns governance items at specific block.<p>
      * It is the result of previous voting of the block and used as configuration for chain at the given block number.
@@ -534,18 +443,18 @@ public Request<?, GovernanceItems> getItemsAt(String blockTag) {
      * @param blockTag The block tag to query
      * @return Request&lt;?, GovernanceItems&gt;
      */
-    public Request<?, GovernanceItems> getItemsAt(DefaultBlockParameterName blockTag) {
-        return getItemsAt((DefaultBlockParameter)blockTag);
-    }
+    // public Request<?, GovernanceItems> getItemsAt(DefaultBlockParameterName blockTag) {
+    //     return getItemsAt((DefaultBlockParameter)blockTag);
+    // }
 
-    Request<?, GovernanceItems> getItemsAt(DefaultBlockParameter blockParameter) {
-        return new Request<>(
-                "governance_itemsAt",
-                Arrays.asList(blockParameter.getValue()),
-                provider,
-                GovernanceItems.class
-        );
-    }
+    // Request<?, GovernanceItems> getItemsAt(DefaultBlockParameter blockParameter) {
+    //     return new Request<>(
+    //             "governance_itemsAt",
+    //             Arrays.asList(blockParameter.getValue()),
+    //             provider,
+    //             GovernanceItems.class
+    //     );
+    // }
 
     /**
      *  Returns the list of items that have received enough number of votes but not yet finalized.<p>
@@ -713,4 +622,28 @@ Request<?, GovernanceStakingInfo> getStakingInfo(DefaultBlockParameter blockPara
                 GovernanceStakingInfo.class
         );
     }
-}
+
+    public Request<?, RewardsAccumulated> getRewardsAccumulated(String fromBlock, String toBlock) {
+        DefaultBlockParameterName fromBlockTagName = DefaultBlockParameterName.fromString(fromBlock);
+        DefaultBlockParameterName toBlockTagName = DefaultBlockParameterName.fromString(toBlock);
+
+        return getRewardsAccumulated(fromBlockTagName, toBlockTagName);
+    }
+
+    public Request<?, RewardsAccumulated> getRewardsAccumulated(BigInteger fromBlock, BigInteger toBlock) {
+        return getRewardsAccumulated(fromBlock, toBlock);
+    }
+
+    public Request<?, RewardsAccumulated> getRewardsAccumulated(DefaultBlockParameterName fromBlock, DefaultBlockParameterName toBlock) {
+        return getRewardsAccumulated((DefaultBlockParameter)fromBlock, (DefaultBlockParameter)toBlock);
+    }
+
+    Request<?, RewardsAccumulated> getRewardsAccumulated(DefaultBlockParameter fromBlock, DefaultBlockParameter toBlock) {
+        return new Request<>(
+                "governance_getRewardsAccumulated",
+                Arrays.asList(fromBlock, toBlock),
+                provider,
+                RewardsAccumulated.class
+        );
+    }
+}