lavanet · omerlavanet · Aug 6, 2024 · Apr 3, 2024 · May 7, 2024 · May 7, 2024
diff --git a/.github/workflows/lava.yml b/.github/workflows/lava.yml
@@ -369,7 +369,14 @@ jobs:
 
   report-tests-results:
     runs-on: ubuntu-latest
-    needs: [test-consensus, test-protocol, test-protocol-e2e, test-payment-e2e] # test-sdk-e2e,
+    needs:
+      [
+        test-consensus,
+        test-protocol,
+        test-protocol-e2e,
+        # test-sdk-e2e,
+        test-payment-e2e,
+      ]
     if: always()
     steps:
       - name: Download Artifacts

diff --git a/config/provider_examples/avalanch_internal_paths_example.yml b/config/provider_examples/avalanch_internal_paths_example.yml
@@ -1,14 +1,14 @@
-# this example show cases how you can setup Avalanche  
+# this example show cases how you can setup Avalanche
 endpoints:
-    - api-interface: jsonrpc
-      chain-id: AVAX
-      network-address: 127.0.0.1:2221
-      node-urls:
-        - url: ws://127.0.0.1:3333/C/rpc/ws
-          internal-path: "/C/rpc" # c chain like specified in the spec
-        - url: https://127.0.0.1:3334/C/avax
-          internal-path: "/C/avax" # c/avax like specified in the spec
-        - url: https://127.0.0.1:3335/X
-          internal-path: "/X" # x chain like specified in the spec
-        - url: https://127.0.0.1:3336/P
-          internal-path: "/P" # p chain like specified in the spec
+  - api-interface: jsonrpc
+    chain-id: AVAX
+    network-address: 127.0.0.1:2221
+    node-urls:
+      - url: ws://127.0.0.1:3333/C/rpc/ws
+        internal-path: "/C/rpc" # c chain like specified in the spec
+      - url: https://127.0.0.1:3334/C/avax
+        internal-path: "/C/avax" # c/avax like specified in the spec
+      - url: https://127.0.0.1:3335/X
+        internal-path: "/X" # x chain like specified in the spec
+      - url: https://127.0.0.1:3336/P
+        internal-path: "/P" # p chain like specified in the spec
diff --git a/cookbook/specs/ethereum.json b/cookbook/specs/ethereum.json
@@ -384,7 +384,7 @@
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": true,
+                                    "subscription": false,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -833,7 +833,7 @@
                                     ],
                                     "parser_func": "DEFAULT"
                                 },
-                                "compute_units": 10,
+                                "compute_units": 1000,
                                 "enabled": true,
                                 "category": {
                                     "deterministic": false,
@@ -874,7 +874,7 @@
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": true,
+                                    "subscription": false,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -883,16 +883,16 @@
                                 "name": "eth_unsubscribe",
                                 "block_parsing": {
                                     "parser_arg": [
-                                        ""
+                                        "latest"
                                     ],
-                                    "parser_func": "EMPTY"
+                                    "parser_func": "DEFAULT"
                                 },
                                 "compute_units": 10,
                                 "enabled": true,
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": false,
+                                    "subscription": true,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -1045,6 +1045,15 @@
                                     "encoding": "hex"
                                 },
                                 "api_name": "eth_getBlockByNumber"
+                            },
+                            {
+                                "function_tag": "SUBSCRIBE",
+                                "api_name": "eth_subscribe"
+                            },
+                            {
+                                "function_template": "{\"jsonrpc\":\"2.0\",\"method\":\"eth_unsubscribe\",\"params\":[\"%s\"],\"id\":1}",
+                                "function_tag": "UNSUBSCRIBE",
+                                "api_name": "eth_unsubscribe"
                             }
                         ],
                         "verifications": [

diff --git a/cookbook/specs/fantom.json b/cookbook/specs/fantom.json
@@ -98,7 +98,7 @@
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": false,
+                                    "subscription": true,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -387,7 +387,7 @@
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": true,
+                                    "subscription": false,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -477,7 +477,7 @@
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": true,
+                                    "subscription": false,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0

diff --git a/cookbook/specs/tendermint.json b/cookbook/specs/tendermint.json
@@ -449,11 +449,11 @@
                                 "name": "subscribe",
                                 "block_parsing": {
                                     "parser_arg": [
-                                        ""
+                                        "latest"
                                     ],
-                                    "parser_func": "EMPTY"
+                                    "parser_func": "DEFAULT"
                                 },
-                                "compute_units": 10,
+                                "compute_units": 1000,
                                 "enabled": true,
                                 "category": {
                                     "deterministic": false,
@@ -521,16 +521,16 @@
                                 "name": "unsubscribe",
                                 "block_parsing": {
                                     "parser_arg": [
-                                        ""
+                                        "latest"
                                     ],
-                                    "parser_func": "EMPTY"
+                                    "parser_func": "DEFAULT"
                                 },
                                 "compute_units": 10,
                                 "enabled": true,
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": false,
+                                    "subscription": true,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -539,16 +539,16 @@
                                 "name": "unsubscribe_all",
                                 "block_parsing": {
                                     "parser_arg": [
-                                        ""
+                                        "latest"
                                     ],
-                                    "parser_func": "EMPTY"
+                                    "parser_func": "DEFAULT"
                                 },
                                 "compute_units": 10,
                                 "enabled": true,
                                 "category": {
                                     "deterministic": false,
                                     "local": true,
-                                    "subscription": false,
+                                    "subscription": true,
                                     "stateful": 0
                                 },
                                 "extra_compute_units": 0
@@ -618,6 +618,20 @@
                                     "encoding": "base64"
                                 },
                                 "api_name": "earliest_block"
+                            },
+                            {
+                                "function_tag": "SUBSCRIBE",
+                                "api_name": "subscribe"
+                            },
+                            {
+                                "function_template": "{\"jsonrpc\":\"2.0\",\"method\":\"unsubscribe\",\"params\":%s,\"id\":1}",
+                                "function_tag": "UNSUBSCRIBE",
+                                "api_name": "unsubscribe"
+                            },
+                            {
+                                "function_template": "{\"jsonrpc\":\"2.0\",\"method\":\"unsubscribe_all\",\"params\":[],\"id\":1}",
+                                "function_tag": "UNSUBSCRIBE_ALL",
+                                "api_name": "unsubscribe_all"
                             }
                         ],
                         "verifications": [

diff --git a/ecosystem/lava-sdk/src/stateTracker/stateQuery/state_badge_query.ts b/ecosystem/lava-sdk/src/stateTracker/stateQuery/state_badge_query.ts
@@ -43,7 +43,7 @@ export class StateBadgeQuery {
 
   // fetchPairing fetches pairing for all chainIDs we support
   public async fetchPairing(): Promise<number> {
-    Logger.debug("Fetching pairing started");
+    Logger.debug("Fetching pairing from badge started");
 
     let timeLeftToNextPairing;
     let virtualEpoch;
@@ -110,7 +110,7 @@ export class StateBadgeQuery {
     this.virtualEpoch = virtualEpoch;
     this.currentEpoch = currentEpoch;
 
-    Logger.debug("Fetching pairing ended");
+    Logger.debug("Fetching pairing from badge ended", timeLeftToNextPairing);
 
     return timeLeftToNextPairing;
   }

diff --git a/ecosystem/lava-sdk/src/stateTracker/stateQuery/state_chain_query.ts b/ecosystem/lava-sdk/src/stateTracker/stateQuery/state_chain_query.ts
@@ -81,7 +81,7 @@ export class StateChainQuery {
   // fetchPairing fetches pairing for all chainIDs we support
   public async fetchPairing(): Promise<number> {
     try {
-      Logger.debug("Fetching pairing started");
+      Logger.debug("Fetching pairing from chain started");
       // Save time till next epoch
       let timeLeftToNextPairing;
       let currentEpoch;
@@ -154,7 +154,7 @@ export class StateChainQuery {
       this.currentEpoch = currentEpoch;
       this.downtimeParams = downtimeParams;
 
-      Logger.debug("Fetching pairing ended");
+      Logger.debug("Fetching pairing from chain ended", timeLeftToNextPairing);
 
       // Return timeLeftToNextPairing
       return timeLeftToNextPairing;

diff --git a/proto/lavanet/lava/spec/api_collection.proto b/proto/lavanet/lava/spec/api_collection.proto
@@ -111,6 +111,9 @@ enum FUNCTION_TAG {
   SET_LATEST_IN_BODY = 4;
   VERIFICATION = 5;
   GET_EARLIEST_BLOCK = 6;
+  SUBSCRIBE = 7;
+  UNSUBSCRIBE = 8;
+  UNSUBSCRIBE_ALL = 9;
 }
 
 enum PARSER_TYPE {

diff --git a/protocol/chainlib/base_chain_parser.go b/protocol/chainlib/base_chain_parser.go
@@ -189,12 +189,14 @@ func (bcp *BaseChainParser) SeparateAddonsExtensions(supported []string) (addons
 			if supportedToCheck == "" {
 				continue
 			}
-			if bcp.isExtension(supportedToCheck) {
+			if bcp.isExtension(supportedToCheck) || supportedToCheck == WebSocketExtension {
 				extensions = append(extensions, supportedToCheck)
 				continue
 			}
 			// neither is an error
-			err = utils.LavaFormatError("invalid supported to check, is neither an addon or an extension", err, utils.Attribute{Key: "spec", Value: bcp.spec.Index}, utils.Attribute{Key: "supported", Value: supportedToCheck})
+			err = utils.LavaFormatError("invalid supported to check, is neither an addon or an extension", err,
+				utils.Attribute{Key: "spec", Value: bcp.spec.Index},
+				utils.Attribute{Key: "supported", Value: supportedToCheck})
 		}
 	}
 	return addons, extensions, err
@@ -252,15 +254,15 @@ func (bcp *BaseChainParser) Construct(spec spectypes.Spec, internalPaths map[str
 	bcp.extensionParser.SetConfiguredExtensions(extensionParser.GetConfiguredExtensions())
 }
 
-func (bcp *BaseChainParser) GetParsingByTag(tag spectypes.FUNCTION_TAG) (parsing *spectypes.ParseDirective, collectionData *spectypes.CollectionData, existed bool) {
+func (bcp *BaseChainParser) GetParsingByTag(tag spectypes.FUNCTION_TAG) (parsing *spectypes.ParseDirective, apiCollection *spectypes.ApiCollection, existed bool) {
 	bcp.rwLock.RLock()
 	defer bcp.rwLock.RUnlock()
 
 	val, ok := bcp.taggedApis[tag]
 	if !ok {
 		return nil, nil, false
 	}
-	return val.Parsing, &val.ApiCollection.CollectionData, ok
+	return val.Parsing, val.ApiCollection, ok
 }
 
 func (bcp *BaseChainParser) ExtensionParsing(addon string, parsedMessageArg *baseChainMessageContainer, extensionInfo extensionslib.ExtensionInfo) {

diff --git a/protocol/chainlib/chain_fetcher.go b/protocol/chainlib/chain_fetcher.go
@@ -262,11 +262,12 @@ func (cf *ChainFetcher) ChainFetcherMetadata() []pairingtypes.Metadata {
 }
 
 func (cf *ChainFetcher) FetchLatestBlockNum(ctx context.Context) (int64, error) {
-	parsing, collectionData, ok := cf.chainParser.GetParsingByTag(spectypes.FUNCTION_TAG_GET_BLOCKNUM)
+	parsing, apiCollection, ok := cf.chainParser.GetParsingByTag(spectypes.FUNCTION_TAG_GET_BLOCKNUM)
 	tagName := spectypes.FUNCTION_TAG_GET_BLOCKNUM.String()
 	if !ok {
 		return spectypes.NOT_APPLICABLE, utils.LavaFormatError(tagName+" tag function not found", nil, []utils.Attribute{{Key: "chainID", Value: cf.endpoint.ChainID}, {Key: "APIInterface", Value: cf.endpoint.ApiInterface}}...)
 	}
+	collectionData := apiCollection.CollectionData
 	var craftData *CraftData
 	if parsing.FunctionTemplate != "" {
 		path := parsing.ApiName
@@ -321,11 +322,13 @@ func (cf *ChainFetcher) constructRelayData(conectionType string, path string, da
 }
 
 func (cf *ChainFetcher) FetchBlockHashByNum(ctx context.Context, blockNum int64) (string, error) {
-	parsing, collectionData, ok := cf.chainParser.GetParsingByTag(spectypes.FUNCTION_TAG_GET_BLOCK_BY_NUM)
+	parsing, apiCollection, ok := cf.chainParser.GetParsingByTag(spectypes.FUNCTION_TAG_GET_BLOCK_BY_NUM)
 	tagName := spectypes.FUNCTION_TAG_GET_BLOCK_BY_NUM.String()
 	if !ok {
 		return "", utils.LavaFormatError(tagName+" tag function not found", nil, []utils.Attribute{{Key: "chainID", Value: cf.endpoint.ChainID}, {Key: "APIInterface", Value: cf.endpoint.ApiInterface}}...)
 	}
+	collectionData := apiCollection.CollectionData
+
 	if parsing.FunctionTemplate == "" {
 		return "", utils.LavaFormatError(tagName+" missing function template", nil, []utils.Attribute{{Key: "chainID", Value: cf.endpoint.ChainID}, {Key: "APIInterface", Value: cf.endpoint.ApiInterface}}...)
 	}