Skip to content

Commit 6cd26da

Browse files
author
lemastero
committed
[ETCM-126] merge from develop
Signed-off-by: lemastero <[email protected]>
2 parents 5f00f21 + 8a18c76 commit 6cd26da

30 files changed

+3154
-1018
lines changed

‎insomnia_workspace.json

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,117 @@
700700
"settingFollowRedirects": "global",
701701
"_type": "request"
702702
},
703+
{
704+
"_id": "req_056848524b07432f9f0167540b54903b",
705+
"parentId": "fld_a06eb77e183c4727800eb7dc43ceabe1",
706+
"modified": 1602080919748,
707+
"created": 1602080239083,
708+
"url": "{{ node_url }}",
709+
"name": "eth_getRawTransactionByHash",
710+
"description": "Returns raw transaction data of a transaction with the given hash",
711+
"method": "POST",
712+
"body": {
713+
"mimeType": "application/json",
714+
"text": "{\n\t\"jsonrpc\": \"2.0\",\n \"method\": \"eth_getRawTransactionByHash\", \n\t\"params\": [\"0x926db397ed35bedee660fe5bf6879679fa71f1fe8c27823f7f6a1e5d96a49b94\"],\n \"id\": 1\n}"
715+
},
716+
"parameters": [],
717+
"headers": [
718+
{
719+
"id": "pair_9f4d6a9dde554cd384487e04fa3b21aa",
720+
"name": "Content-Type",
721+
"value": "application/json"
722+
},
723+
{
724+
"id": "pair_088edc31f5e04f20a16b465a673871bb",
725+
"name": "Cache-Control",
726+
"value": "no-cache"
727+
}
728+
],
729+
"authentication": {},
730+
"metaSortKey": -1552732410741.25,
731+
"isPrivate": false,
732+
"settingStoreCookies": true,
733+
"settingSendCookies": true,
734+
"settingDisableRenderRequestBody": false,
735+
"settingEncodeUrl": true,
736+
"settingRebuildPath": true,
737+
"settingFollowRedirects": "global",
738+
"_type": "request"
739+
},
740+
{
741+
"_id": "req_e9008e2f2aa14acca2f3e6eca0c30677",
742+
"parentId": "fld_a06eb77e183c4727800eb7dc43ceabe1",
743+
"modified": 1602080922028,
744+
"created": 1602080826211,
745+
"url": "{{ node_url }}",
746+
"name": "eth_getRawTransactionByBlockHashAndIndex",
747+
"description": "Returns raw transaction data of a transaction with the block hash and index of which it was mined",
748+
"method": "POST",
749+
"body": {
750+
"mimeType": "application/json",
751+
"text": "{\n\t\"jsonrpc\": \"2.0\",\n \"method\": \"eth_getRawTransactionByBlockHashAndIndex\", \n\t\"params\": [\"0x926db397ed35bedee660fe5bf6879679fa71f1fe8c27823f7f6a1e5d96a49b94\"],\n \"id\": 1\n}"
752+
},
753+
"parameters": [],
754+
"headers": [
755+
{
756+
"id": "pair_9f4d6a9dde554cd384487e04fa3b21aa",
757+
"name": "Content-Type",
758+
"value": "application/json"
759+
},
760+
{
761+
"id": "pair_088edc31f5e04f20a16b465a673871bb",
762+
"name": "Cache-Control",
763+
"value": "no-cache"
764+
}
765+
],
766+
"authentication": {},
767+
"metaSortKey": -1552732410728.75,
768+
"isPrivate": false,
769+
"settingStoreCookies": true,
770+
"settingSendCookies": true,
771+
"settingDisableRenderRequestBody": false,
772+
"settingEncodeUrl": true,
773+
"settingRebuildPath": true,
774+
"settingFollowRedirects": "global",
775+
"_type": "request"
776+
},
777+
{
778+
"_id": "req_37fea96b211241f495fc5d09081a5045",
779+
"parentId": "fld_a06eb77e183c4727800eb7dc43ceabe1",
780+
"modified": 1602080924128,
781+
"created": 1602080883045,
782+
"url": "{{ node_url }}",
783+
"name": "eth_getRawTransactionByBlockNumberAndIndex",
784+
"description": "Returns raw transaction data of a transaction with the block number and index of which it was mined",
785+
"method": "POST",
786+
"body": {
787+
"mimeType": "application/json",
788+
"text": "{\n\t\"jsonrpc\": \"2.0\",\n \"method\": \"eth_getRawTransactionByBlockNumberAndIndex\", \n\t\"params\": [\"0x926db397ed35bedee660fe5bf6879679fa71f1fe8c27823f7f6a1e5d96a49b94\"],\n \"id\": 1\n}"
789+
},
790+
"parameters": [],
791+
"headers": [
792+
{
793+
"id": "pair_9f4d6a9dde554cd384487e04fa3b21aa",
794+
"name": "Content-Type",
795+
"value": "application/json"
796+
},
797+
{
798+
"id": "pair_088edc31f5e04f20a16b465a673871bb",
799+
"name": "Cache-Control",
800+
"value": "no-cache"
801+
}
802+
],
803+
"authentication": {},
804+
"metaSortKey": -1552732410722.5,
805+
"isPrivate": false,
806+
"settingStoreCookies": true,
807+
"settingSendCookies": true,
808+
"settingDisableRenderRequestBody": false,
809+
"settingEncodeUrl": true,
810+
"settingRebuildPath": true,
811+
"settingFollowRedirects": "global",
812+
"_type": "request"
813+
},
703814
{
704815
"_id": "req_71950018809a482da79fc927070de862",
705816
"parentId": "fld_a06eb77e183c4727800eb7dc43ceabe1",

‎project/Dependencies.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ object Dependencies {
9797
"org.scala-sbt.ipcsocket" % "ipcsocket" % "1.1.0",
9898
"com.google.guava" % "guava" % "29.0-jre",
9999
"org.xerial.snappy" % "snappy-java" % "1.1.7.7",
100-
"org.web3j" % "core" % "5.0.0" % Test
100+
"org.web3j" % "core" % "5.0.0" % Test,
101+
"io.vavr" % "vavr" % "1.0.0-alpha-3"
101102
)
102103

103104
val prometheus: Seq[ModuleID] = {

‎repo.nix

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,6 +1688,22 @@
16881688
url = "https://repo1.maven.org/maven2/io/suzaku/boopickle_2.12/1.3.3/boopickle_2.12-1.3.3.pom";
16891689
sha256 = "E88B339905B0C67211E08683A95AC7DB5185BF10BC7EC91378D95389D7CD5807";
16901690
};
1691+
"nix-public/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3-javadoc.jar" = {
1692+
url = "https://repo1.maven.org/maven2/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3-javadoc.jar";
1693+
sha256 = "1F27BFD5D6187F5C57B699979ADE958C71D5A00A7C71B90ADA6F46A1FE0EFA78";
1694+
};
1695+
"nix-public/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3-sources.jar" = {
1696+
url = "https://repo1.maven.org/maven2/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3-sources.jar";
1697+
sha256 = "CDE11815C879F2ED21437A59905F98C36F1BC4FFE1ACA2F7309A28EDEF60538A";
1698+
};
1699+
"nix-public/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3.jar" = {
1700+
url = "https://repo1.maven.org/maven2/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3.jar";
1701+
sha256 = "D68F2A25AF5BDD4D26B2D272304040F39CB5031D91A3A295F13B9DE9EF0946B0";
1702+
};
1703+
"nix-public/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3.pom" = {
1704+
url = "https://repo1.maven.org/maven2/io/vavr/vavr/1.0.0-alpha-3/vavr-1.0.0-alpha-3.pom";
1705+
sha256 = "CF7C124A2C9EA71543EFD99C6A5BB0BB31C44BDF266A28F819AD1509C825ED88";
1706+
};
16911707
"nix-public/jline/jline/2.14.6/jline-2.14.6-javadoc.jar" = {
16921708
url = "https://repo1.maven.org/maven2/jline/jline/2.14.6/jline-2.14.6-javadoc.jar";
16931709
sha256 = "EBD162363C0A6CA9E52AF51D7377F78F559D3F2663DC896E0DBF3B16A0188972";

0 commit comments

Comments
 (0)