Merge pull request #983 from HorizenOfficial/version_0_10_1_snapshot

Version 0.10.1

CHANGELOG.md

@@ -1,3 +1,6 @@
+**0.10.1**
+* [eth RPC endpoint] Additional fix on json representation in RPC response of signature V field for transaction type 2 - it should be in range of 0-1.
+
 **0.10.0**
 1. Added support for multisg MC addresses in ZenDAO Native Smart Contract
 2. Added support for ZenIP 42203/42206: 

README.md

@@ -48,7 +48,7 @@ While we keep monitoring the memory footprint of the proofs generation process,
  - After the installation, just run `export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` before starting the sidechain node, or run the sidechain node adding `LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` at the beginning of the java command line as follows:
 
 ```
-LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.10.0.jar:./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
+LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.10.1.jar:./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
 ```
  - In the folder `ci` you will find the script `run_sc.sh` to automatically check and use jemalloc library while starting the sidechain node. 
 

ci/run_sc.sh

@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-SIMPLE_APP_VERSION="${SIMPLE_APP_VERSION:-0.10.0}"
+SIMPLE_APP_VERSION="${SIMPLE_APP_VERSION:-0.10.1}"
 
 if [ -d "$1" ] && [ -f "$2" ]; then
   path_to_jemalloc="$(ldconfig -p | grep "$(arch)" | grep 'libjemalloc\.so\.1$' | tr -d ' ' | cut -d '>' -f 2)"

doc/index.md

@@ -1,5 +1,6 @@
 # Horizen Sidechain SDK Release Notes
 
+## Version [0.10.1](/doc/release/0.10.1.md) 
 ## Version [0.10.0](/doc/release/0.10.0.md) 
 ## Version [0.9.0](/doc/release/0.9.0.md) 
 ## Version [0.8.1](/doc/release/0.8.1.md) 

doc/release/0.10.1.md

@@ -0,0 +1,16 @@
+# Release notes - version 0.10.1
+---
+
+This is a maintenance release that fixes the json representation of the V field signature in the following RPC endpoints (previous fix contained in 0.10.0 was applied only to the 'old' http endpoints):  
+
+- eth_getTransactionByHash  
+- eth_getTransactionByBlockHashAndIndex  
+- eth_getTransactionByBlockNumberAndIndex  
+- eth_getBlockByNumber  
+- eth_getBlockByHash  
+- txpool_content  
+- txpool_contentFrom  
+
+---
+Full [Changelog](/CHANGELOG.md) file here
+

examples/README.md

@@ -44,24 +44,24 @@ Otherwise, to run an Example App outside the IDE:
 * (Windows)
     ```
     cd Sidechains-SDK\examples\simpleapp
-    java -cp ./target/sidechains-sdk-simpleapp-0.10.0.jar;./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
+    java -cp ./target/sidechains-sdk-simpleapp-0.10.1.jar;./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
     ```
 * (Linux)
     ```
     cd ./Sidechains-SDK/examples/utxo/simpleapp
-    java -cp ./target/sidechains-sdk-simpleapp-0.10.0.jar:./target/lib/\* io.horizen.examples.SimpleApp <path_to_config_file>
+    java -cp ./target/sidechains-sdk-simpleapp-0.10.1.jar:./target/lib/\* io.horizen.examples.SimpleApp <path_to_config_file>
     ```
 **Model: Account**
 
 * (Windows)
     ```
     cd Sidechains-SDK\examples\evmapp
-    java -cp ./target/sidechains-sdk-evmapp-0.10.0.jar;./target/lib/* io.horizen.examples.EvmApp <path_to_config_file>
+    java -cp ./target/sidechains-sdk-evmapp-0.10.1.jar;./target/lib/* io.horizen.examples.EvmApp <path_to_config_file>
     ```
 * (Linux)
     ```
     cd ./Sidechains-SDK/examples/account/evmapp
-    java -cp ./target/sidechains-evmapp-0.10.0.jar:./target/lib/\* io.horizen.examples.EvmApp <path_to_config_file>
+    java -cp ./target/sidechains-evmapp-0.10.1.jar:./target/lib/\* io.horizen.examples.EvmApp <path_to_config_file>
     ```
 
 On some Linux OSs during backward transfers certificates proofs generation an extremely large RAM consumption may happen, that will lead to the process being force killed by the OS.
@@ -74,7 +74,7 @@ While we keep monitoring the memory footprint of the proofs generation process,
 	     - After the installation, just run `export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` before starting the sidechain node, or run the sidechain node adding `LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1` at the beginning of the java command line as follows:
 
 	     ```
-	     LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.10.0.jar:./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
+	     LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 java -cp ./target/sidechains-sdk-simpleapp-0.10.1.jar:./target/lib/* io.horizen.examples.SimpleApp <path_to_config_file>
 	     ```
 	      - In the folder `ci` you will find the script `run_sc.sh` to automatically check and use jemalloc library while starting the sidechain node.
 

examples/account/evmapp/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-evmapp</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2022</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

examples/account/evmapp_sctool/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-evmapp_sctool</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2022</inceptionYear>
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-scbootstrappingtools</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-evmapp</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

examples/mc_sc_workflow_example.md

@@ -32,8 +32,8 @@ Build SDK components by using a command (in the root of the Sidechains-SDK folde
 
 Run Bootstrapping tool using the command depending on the sidechain model:
 
-- account: `java -jar tools/sidechains-sdk-account_sctools/target/sidechains-sdk-account_sctools-0.10.0.jar`
-- utxo: `java -jar tools/sidechains-sdk-utxo_sctools/target/sidechains-sdk-utxo_sctools-0.10.0.jar`
+- account: `java -jar tools/sidechains-sdk-account_sctools/target/sidechains-sdk-account_sctools-0.10.1.jar`
+- utxo: `java -jar tools/sidechains-sdk-utxo_sctools/target/sidechains-sdk-utxo_sctools-0.10.1.jar`
 
 All other commands are performed as commands for Bootstrapping tool in the next format: `"command name"  "parameters for command in JSON format"`.
 For any help, you could use the command `help`, for the exit just print `exit`
@@ -507,30 +507,30 @@ Run an Example App with the `my_settings.conf`:
 
 * For Windows:
  ```
-    java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.0.jar;./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
+    java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.1.jar;./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
 ```
 * For Linux (Glibc):
 ```
-    java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.0.jar:./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
+    java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.1.jar:./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
 ```
 * For Linux (Jemalloc):
 ```
-    LD_PRELOAD=<path to jemalloc library>/libjemalloc.so.1 java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.0.jar:./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
+    LD_PRELOAD=<path to jemalloc library>/libjemalloc.so.1 java -cp ./examples/utxo/simpleapp/target/sidechains-sdk-simpleapp-0.10.1.jar:./examples/simpleapp/target/lib/* io.horizen.examples.SimpleApp ./examples/my_settings.conf
 ```
 
 **Model: Account**
 
 * For Windows:
  ```
-    java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.0.jar;./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
+    java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.1.jar;./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
 ```
 * For Linux (Glibc):
 ```
-    java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.0.jar:./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
+    java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.1.jar:./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
 ```
 * For Linux (Jemalloc):
 ```
-    LD_PRELOAD=<path to jemalloc library>/libjemalloc.so.1 java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.0.jar:./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
+    LD_PRELOAD=<path to jemalloc library>/libjemalloc.so.1 java -cp ./examples/account/evmapp/target/sidechains-sdk-evmapp-0.10.1.jar:./examples/evmapp/target/lib/* io.horizen.examples.EvmApp ./examples/my_settings.conf
 ```
 
 

examples/utxo/simpleapp/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-simpleapp</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2018</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

examples/utxo/utxoapp_sctool/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-utxoapp_sctool</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2018</inceptionYear>
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
@@ -14,13 +14,13 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-scbootstrappingtools</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-simpleapp</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>Sidechains</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2018</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

qa/SidechainTestFramework/scutil.py

@@ -19,7 +19,7 @@
 
 WAIT_CONST = 1
 
-SNAPSHOT_VERSION_TAG = "0.10.0"
+SNAPSHOT_VERSION_TAG = "0.10.1"
 
 # log levels of the log4j trace system used by java applications
 APP_LEVEL_OFF = "off"

sdk/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>Zendoo is a unique sidechain and scaling solution developed by Horizen. The Zendoo ${project.artifactId} is a framework that supports the creation of sidechains and their custom business logic, with the Horizen public blockchain as the mainchain.</description>
   <url>https://github.com/${project.github.organization}/${project.artifactId}</url>

sdk/src/main/java/io/horizen/account/api/rpc/types/EthereumTransactionView.java

@@ -6,6 +6,8 @@
 import io.horizen.evm.Address;
 import io.horizen.evm.Hash;
 import io.horizen.utils.BytesUtils;
+import org.web3j.crypto.Sign;
+
 import java.math.BigInteger;
 import java.util.Objects;
 
@@ -71,7 +73,13 @@ public EthereumTransactionView(EthereumTransaction tx, EthereumReceipt receipt,
         if (signature == null) {
             v = null; r = null; s = null;
         } else {
-            v = signature.getV();
+            if (tx.isEIP1559()) {
+                // isEIP1559 txs are defined to use 0 and 1 as their recovery
+                // id, subtract 27 to become equivalent to unprotected Homestead signatures.
+                v = signature.getV().subtract(BigInteger.valueOf(Sign.LOWER_REAL_V));
+            } else {
+                v = signature.getV();
+            }
             r = signature.getR();
             s = signature.getS();
         }

sdk/src/test/scala/io/horizen/account/api/rpc/service/EthServiceTest.scala

@@ -84,7 +84,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
       "gasPrice": "0x342770c1",
       "chainId": "0x10f447",
       "accessList": [],
-      "v": "0x1c",
+      "v": "0x1",
       "r": "0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
       "s": "0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d"
     }"""
@@ -143,7 +143,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
                "maxPriorityFeePerGas":"0x6ef91",
                "maxFeePerGas":"0x3b9aca64",
                "chainId":"0x7cd",
-               "v":"0x1c",
+               "v":"0x1",
                "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
                "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
                "accessList":[]
@@ -164,7 +164,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
                "maxPriorityFeePerGas":"0x6ef91",
                "maxFeePerGas":"0x3b9aca64",
                "chainId":"0x7cd",
-               "v":"0x1c",
+               "v":"0x1",
                "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
                "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
                "accessList":[]
@@ -187,7 +187,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
                "maxPriorityFeePerGas":"0x6ef91",
                "maxFeePerGas":"0x3b9aca64",
                "chainId":"0x7cd",
-               "v":"0x1c",
+               "v":"0x1",
                "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
                "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
                "accessList":[]
@@ -212,7 +212,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
                "maxPriorityFeePerGas":"0x6ef91",
                "maxFeePerGas":"0x3b9aca64",
                "chainId":"0x7cd",
-               "v":"0x1c",
+               "v":"0x1",
                "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
                "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
                "accessList":[]
@@ -239,7 +239,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
          "maxPriorityFeePerGas":"0x6ef91",
          "maxFeePerGas":"0x3b9aca64",
          "chainId":"0x7cd",
-         "v":"0x1c",
+         "v":"0x1",
          "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
          "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
          "accessList":[]
@@ -266,7 +266,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
              "maxPriorityFeePerGas":"0x6ef91",
              "maxFeePerGas":"0x3b9aca64",
              "chainId":"0x7cd",
-             "v":"0x1c",
+             "v":"0x1",
              "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
              "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
              "accessList":[]
@@ -289,7 +289,7 @@ class EthServiceTest extends JUnitSuite with MockitoSugar with ReceiptFixture wi
              "maxPriorityFeePerGas":"0x6ef91",
              "maxFeePerGas":"0x3b9aca64",
              "chainId":"0x7cd",
-             "v":"0x1c",
+             "v":"0x1",
              "r":"0x805c658ac084be6da079d96bd4799bef3aa4578c8e57b97c3c6df9f581551023",
              "s":"0x568277f09a64771f5b4588ff07f75725a8e40d2c641946eb645152dcd4c93f0d",
              "accessList":[]

tools/dbtool/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-dbtools</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <inceptionYear>2022</inceptionYear>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

tools/sctool/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-scbootstrappingtools</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>This module offers a way to create a sidechain's configuration file and some utilities.</description>
   <url>https://github.com/${project.github.organization}/${project.artifactId}</url>
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

tools/sidechains-sdk-account_sctools/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.horizen</groupId>
   <artifactId>sidechains-sdk-account_sctools</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <name>${project.groupId}:${project.artifactId}</name>
   <description>This module offers a way to create a sidechain's configuration file and some utilities (account model).</description>
   <url>https://github.com/${project.github.organization}/${project.artifactId}</url>
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>io.horizen</groupId>
       <artifactId>sidechains-sdk-scbootstrappingtools</artifactId>
-      <version>0.10.0</version>
+      <version>0.10.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>