Merge branch 'main' into keeper_soak

Author: skudasov

Makefile

@@ -72,6 +72,10 @@ test_ocr_soak: ## run OCR soak test
 test_keeper_soak: ## run Keeper soak/performance test
 	NETWORK="ethereum_geth_performance" ginkgo -r --focus="@performance-keeper"
 
+.PHONY: test_vrf_soak
+test_vrf_soak: ## run VRF soak test
+	NETWORK="ethereum_geth_performance" ginkgo -r --focus="@soak-vrf"
+
 .PHONY: test_runlog
 test_runlog: ## run runlog tests
 	ginkgo -r --focus=@runlog
@@ -82,4 +86,8 @@ test_contract: ## run contract tests
 
 .PHONY: test_vrf
 test_vrf: ## run vrf tests
-	ginkgo -r --focus=@vrf
+	ginkgo -r --focus=@vrf
+
+.PHONY: test_observability
+test_observability: # run observability tests
+	ginkgo -r --focus=@observability

client/mockserver.go

@@ -0,0 +1,88 @@
+package client
+
+import (
+	"net/http"
+)
+
+// MockserverClient mockserver client
+type MockserverClient struct {
+	*BasicHTTPClient
+	Config *MockserverConfig
+}
+
+// MockserverConfig holds config information for MockserverClient
+type MockserverConfig struct {
+	LocalURL   string
+	ClusterURL string
+}
+
+// NewMockserverClient returns a mockserver client
+func NewMockserverClient(cfg *MockserverConfig) *MockserverClient {
+	return &MockserverClient{
+		Config:          cfg,
+		BasicHTTPClient: NewBasicHTTPClient(&http.Client{}, cfg.LocalURL),
+	}
+}
+
+// PutExpectations sets the expectations (i.e. mocked responses)
+func (em *MockserverClient) PutExpectations(body interface{}) error {
+	_, err := em.do(http.MethodPut, "/expectation", &body, nil, http.StatusCreated)
+	return err
+}
+
+// ClearExpectation clears expectations
+func (em *MockserverClient) ClearExpectation(body interface{}) error {
+	_, err := em.do(http.MethodPut, "/clear", &body, nil, http.StatusOK)
+	return err
+}
+
+// PathSelector represents the json object used to find expectations by path
+type PathSelector struct {
+	Path string `json:"path"`
+}
+
+// HttpRequest represents the httpRequest json object used in the mockserver initializer
+type HttpRequest struct {
+	Path string `json:"path"`
+}
+
+// HttpResponse represents the httpResponse json object used in the mockserver initializer
+type HttpResponse struct {
+	Body interface{} `json:"body"`
+}
+
+// HttpInitializer represents an element of the initializer array used in the mockserver initializer
+type HttpInitializer struct {
+	Request  HttpRequest  `json:"httpRequest"`
+	Response HttpResponse `json:"httpResponse"`
+}
+
+// For OTPE - weiwatchers
+
+// NodeInfoJSON represents an element of the nodes array used to deliver configs to otpe
+type NodeInfoJSON struct {
+	ID          string   `json:"id"`
+	NodeAddress []string `json:"nodeAddress"`
+}
+
+// ContractInfoJSON represents an element of the contracts array used to deliver configs to otpe
+type ContractInfoJSON struct {
+	ContractAddress string `json:"contractAddress"`
+	ContractVersion int    `json:"contractVersion"`
+	Path            string `json:"path"`
+	Status          string `json:"status"`
+}
+
+// For Adapter endpoints
+
+// AdapterResult represents an int result for an adapter
+type AdapterResult struct {
+	Result int `json:"result"`
+}
+
+// AdapterResponse represents a response from an adapter
+type AdapterResponse struct {
+	Id    string        `json:"id"`
+	Data  AdapterResult `json:"data"`
+	Error interface{}   `json:"error"`
+}

client/prometheus.go

@@ -97,3 +97,21 @@ func (p *Prometheus) ResourcesSummary() (float64, float64, error) {
 	}
 	return cpu, mem, nil
 }
+
+// GetAlerts returns all firing alerts
+func (p *Prometheus) GetAlerts() (v1.AlertsResult, error) {
+	alerts, err := p.API.Alerts(context.Background())
+	if err != nil {
+		return v1.AlertsResult{}, err
+	}
+	return alerts, nil
+}
+
+// GetQuery returns the result of applying a PromQL query
+func (p *Prometheus) GetQuery(query string) (model.Value, error) {
+	value, _, err := p.API.Query(context.Background(), query, time.Now())
+	if err != nil {
+		return nil, err
+	}
+	return value, nil
+}

config.yml

@@ -198,6 +198,13 @@ networks:
         private_url: moonbase_alpha_url
         private_keys:
             - moonbase_alpha_1
+    iotex_testnet:
+        <<: *common_ethereum_testnet
+        name: "IoTeX testnet"
+        chain_id: 4690
+        private_url: iotex_testnet_url
+        private_keys:
+            - iotex_testnet_1
 retry:
     attempts: 120
     linear_delay: 1s

contracts/contract_models.go

@@ -258,7 +258,9 @@ type VRFCoordinator interface {
 }
 
 type VRFConsumer interface {
+	Address() string
 	RequestRandomness(fromWallet client.BlockchainWallet, hash [32]byte, fee *big.Int) error
+	CurrentRoundID(ctx context.Context) (*big.Int, error)
 	RandomnessOutput(ctx context.Context) (*big.Int, error)
 	Fund(fromWallet client.BlockchainWallet, ethAmount, linkAmount *big.Float) error
 }

contracts/ethereum/VRFConsumer.go

@@ -15,6 +15,32 @@
     "stateMutability": "nonpayable",
     "type": "constructor"
   },
+  {
+    "inputs": [],
+    "name": "currentRoundID",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "prevRandomnessOutput",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "randomnessOutput",