Merge branch 'develop' into zetaclient-fixes

zeta-chain · Sep 22, 2023 · da5fa56 · da5fa56
2 parents e90db0f + 9db49d1
commit da5fa56
Show file tree

Hide file tree

Showing 65 changed files with 2,507 additions and 1,317 deletions.
diff --git a/contrib/localnet/orchestrator/smoketest/test_stress.go b/contrib/localnet/orchestrator/smoketest/test_stress.go
@@ -218,7 +218,7 @@ func (sm *SmokeTest) EchoNetworkMetrics() {
 			numTicks++
 			// Get all pending outbound transactions
 			cctxResp, err := sm.cctxClient.CctxAllPending(context.Background(), &types2.QueryAllCctxPendingRequest{
-				ChainId: uint64(common.GoerliChain().ChainId),
+				ChainId: common.GoerliChain().ChainId,
 			})
 			if err != nil {
 				continue

diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml
@@ -26596,11 +26596,11 @@ paths:
           schema:
             $ref: '#/definitions/googlerpcStatus'
       parameters:
-        - name: chainId
+        - name: chain_id
           in: query
           required: false
           type: string
-          format: uint64
+          format: int64
         - name: pagination.key
           description: |-
             key is a value returned in PageResponse.next_key to begin
@@ -27230,7 +27230,7 @@ paths:
           in: path
           required: true
           type: string
-          format: uint64
+          format: int64
       tags:
         - Query
   /zeta-chain/crosschain/protocolFee:
@@ -27315,6 +27315,20 @@ paths:
           type: string
       tags:
         - Query
+  /zeta-chain/observer/crosschain_flags:
+    get:
+      operationId: Query_CrosschainFlags
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/observerQueryGetCrosschainFlagsResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      tags:
+        - Query
   /zeta-chain/observer/get_all_blame_records:
     get:
       summary: Queries a list of VoterByIdentifier items.
@@ -27573,20 +27587,6 @@ paths:
             $ref: '#/definitions/googlerpcStatus'
       tags:
         - Query
-  /zeta-chain/observer/permission_flags:
-    get:
-      operationId: Query_PermissionFlags
-      responses:
-        "200":
-          description: A successful response.
-          schema:
-            $ref: '#/definitions/observerQueryGetPermissionFlagsResponse'
-        default:
-          description: An unexpected error response.
-          schema:
-            $ref: '#/definitions/googlerpcStatus'
-      tags:
-        - Query
   /zeta-chain/observer/prove:
     get:
       summary: merkle proof verification
@@ -50929,6 +50929,26 @@ definitions:
         items:
           type: object
           $ref: '#/definitions/observerCoreParams'
+  observerCrosschainFlags:
+    type: object
+    properties:
+      isInboundEnabled:
+        type: boolean
+      isOutboundEnabled:
+        type: boolean
+      gasPriceIncreaseFlags:
+        $ref: '#/definitions/observerGasPriceIncreaseFlags'
+  observerGasPriceIncreaseFlags:
+    type: object
+    properties:
+      epochLength:
+        type: string
+        format: int64
+      retryInterval:
+        type: string
+      gasPriceIncreasePercent:
+        type: integer
+        format: int64
   observerKeygen:
     type: object
     properties:
@@ -50967,9 +50987,9 @@ definitions:
     type: object
   observerMsgUpdateCoreParamsResponse:
     type: object
-  observerMsgUpdateKeygenResponse:
+  observerMsgUpdateCrosschainFlagsResponse:
     type: object
-  observerMsgUpdatePermissionFlagsResponse:
+  observerMsgUpdateKeygenResponse:
     type: object
   observerNode:
     type: object
@@ -51034,13 +51054,6 @@ definitions:
         type: string
       is_supported:
         type: boolean
-  observerPermissionFlags:
-    type: object
-    properties:
-      isInboundEnabled:
-        type: boolean
-      isOutboundEnabled:
-        type: boolean
   observerPolicy_Type:
     type: string
     enum:
@@ -51122,6 +51135,11 @@ definitions:
     properties:
       core_params:
         $ref: '#/definitions/observerCoreParamsList'
+  observerQueryGetCrosschainFlagsResponse:
+    type: object
+    properties:
+      crosschain_flags:
+        $ref: '#/definitions/observerCrosschainFlags'
   observerQueryGetKeygenResponse:
     type: object
     properties:
@@ -51132,11 +51150,6 @@ definitions:
     properties:
       node_account:
         $ref: '#/definitions/observerNodeAccount'
-  observerQueryGetPermissionFlagsResponse:
-    type: object
-    properties:
-      permission_flags:
-        $ref: '#/definitions/observerPermissionFlags'
   observerQueryObserversByChainResponse:
     type: object
     properties:

diff --git a/docs/spec/observer/messages.md b/docs/spec/observer/messages.md
@@ -41,18 +41,17 @@ message MsgAddBlameVote {
 }
 ```
 
-## MsgUpdatePermissionFlags
-
-Updates permissions. Currently, this is only used to enable/disable the
-inbound transactions.
+## MsgUpdateCrosschainFlags
 
+UpdateCrosschainFlags updates the crosschain related flags.
 Only the admin policy account is authorized to broadcast this message.
 
 ```proto
-message MsgUpdatePermissionFlags {
+message MsgUpdateCrosschainFlags {
 	string creator = 1;
 	bool isInboundEnabled = 3;
 	bool isOutboundEnabled = 4;
+	GasPriceIncreaseFlags gasPriceIncreaseFlags = 5;
 }
 ```
 

diff --git a/proto/crosschain/query.proto b/proto/crosschain/query.proto
@@ -258,7 +258,7 @@ message QueryAllPendingNoncesResponse {
 }
 
 message QueryPendingNoncesByChainRequest {
-  uint64 chain_id = 1;
+  int64 chain_id = 1;
 }
 
 message QueryPendingNoncesByChainResponse {
@@ -305,7 +305,7 @@ message QueryAllCctxResponse {
 }
 
 message QueryAllCctxPendingRequest {
-  uint64 chainId = 1;
+  int64 chain_id = 1;
   cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 

diff --git a/proto/observer/crosschain_flags.proto b/proto/observer/crosschain_flags.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+package zetachain.zetacore.observer;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/duration.proto";
+
+option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
+
+message GasPriceIncreaseFlags {
+  int64 epochLength = 1;
+  google.protobuf.Duration retryInterval = 2 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true
+  ];
+  uint32 gasPriceIncreasePercent = 3;
+}
+
+message CrosschainFlags {
+  bool isInboundEnabled = 1;
+  bool isOutboundEnabled = 2;
+  GasPriceIncreaseFlags gasPriceIncreaseFlags = 3;
+}
diff --git a/proto/observer/events.proto b/proto/observer/events.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
+import "observer/crosschain_flags.proto";
 import "observer/observer.proto";
 
 option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
@@ -27,3 +28,11 @@ message EventNewObserverAdded {
   string zetaclient_grantee_pubkey = 4;
   uint64 observer_last_block_count = 5;
 }
+
+message EventCrosschainFlagsUpdated {
+  string msg_type_url = 1;
+  bool isInboundEnabled = 2;
+  bool isOutboundEnabled = 3;
+  GasPriceIncreaseFlags gasPriceIncreaseFlags = 4;
+  string signer = 5;
+}
diff --git a/proto/observer/genesis.proto b/proto/observer/genesis.proto
@@ -3,19 +3,19 @@ package zetachain.zetacore.observer;
 
 import "gogoproto/gogo.proto";
 import "observer/ballot.proto";
+import "observer/crosschain_flags.proto";
 import "observer/keygen.proto";
 import "observer/node_account.proto";
 import "observer/observer.proto";
 import "observer/params.proto";
-import "observer/permission_flags.proto";
 
 option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
 
 message GenesisState {
   repeated Ballot ballots = 1;
   repeated ObserverMapper observers = 2;
   repeated NodeAccount nodeAccountList = 3;
-  PermissionFlags permission_flags = 4;
+  CrosschainFlags crosschain_flags = 4;
   Params params = 5;
   Keygen keygen = 6;
   LastObserverCount last_observer_count = 7;

diff --git a/proto/observer/keygen.proto b/proto/observer/keygen.proto
@@ -11,6 +11,7 @@ enum KeygenStatus {
   KeyGenSuccess = 1;
   KeyGenFailed = 3;
 }
+
 message Keygen {
   KeygenStatus status = 2; // 0--to generate key; 1--generated; 2--error
   repeated string granteePubkeys = 3;

diff --git a/proto/observer/permission_flags.proto b/proto/observer/permission_flags.proto
diff --git a/proto/observer/query.proto b/proto/observer/query.proto
@@ -7,11 +7,11 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "observer/ballot.proto";
 import "observer/blame.proto";
+import "observer/crosschain_flags.proto";
 import "observer/keygen.proto";
 import "observer/node_account.proto";
 import "observer/observer.proto";
 import "observer/params.proto";
-import "observer/permission_flags.proto";
 
 option go_package = "github.com/zeta-chain/zetacore/x/observer/types";
 
@@ -57,8 +57,8 @@ service Query {
   rpc NodeAccountAll(QueryAllNodeAccountRequest) returns (QueryAllNodeAccountResponse) {
     option (google.api.http).get = "/zeta-chain/observer/nodeAccount";
   }
-  rpc PermissionFlags(QueryGetPermissionFlagsRequest) returns (QueryGetPermissionFlagsResponse) {
-    option (google.api.http).get = "/zeta-chain/observer/permission_flags";
+  rpc CrosschainFlags(QueryGetCrosschainFlagsRequest) returns (QueryGetCrosschainFlagsResponse) {
+    option (google.api.http).get = "/zeta-chain/observer/crosschain_flags";
   }
   // Queries a keygen by index.
   rpc Keygen(QueryGetKeygenRequest) returns (QueryGetKeygenResponse) {
@@ -179,10 +179,10 @@ message QueryAllNodeAccountResponse {
   cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
-message QueryGetPermissionFlagsRequest {}
+message QueryGetCrosschainFlagsRequest {}
 
-message QueryGetPermissionFlagsResponse {
-  PermissionFlags permission_flags = 1 [(gogoproto.nullable) = false];
+message QueryGetCrosschainFlagsResponse {
+  CrosschainFlags crosschain_flags = 1 [(gogoproto.nullable) = false];
 }
 
 message QueryGetKeygenRequest {}

diff --git a/proto/observer/tx.proto b/proto/observer/tx.proto
@@ -4,6 +4,7 @@ package zetachain.zetacore.observer;
 import "common/common.proto";
 import "gogoproto/gogo.proto";
 import "observer/blame.proto";
+import "observer/crosschain_flags.proto";
 import "observer/observer.proto";
 import "observer/params.proto";
 
@@ -14,7 +15,7 @@ service Msg {
   rpc AddObserver(MsgAddObserver) returns (MsgAddObserverResponse);
   rpc UpdateCoreParams(MsgUpdateCoreParams) returns (MsgUpdateCoreParamsResponse);
   rpc AddBlameVote(MsgAddBlameVote) returns (MsgAddBlameVoteResponse);
-  rpc UpdatePermissionFlags(MsgUpdatePermissionFlags) returns (MsgUpdatePermissionFlagsResponse);
+  rpc UpdateCrosschainFlags(MsgUpdateCrosschainFlags) returns (MsgUpdateCrosschainFlagsResponse);
   rpc UpdateKeygen(MsgUpdateKeygen) returns (MsgUpdateKeygenResponse);
   rpc AddBlockHeader(MsgAddBlockHeader) returns (MsgAddBlockHeaderResponse);
 }
@@ -52,12 +53,14 @@ message MsgAddBlameVote {
 }
 
 message MsgAddBlameVoteResponse {}
-message MsgUpdatePermissionFlags {
+
+message MsgUpdateCrosschainFlags {
   string creator = 1;
   bool isInboundEnabled = 3;
   bool isOutboundEnabled = 4;
+  GasPriceIncreaseFlags gasPriceIncreaseFlags = 5;
 }
-message MsgUpdatePermissionFlagsResponse {}
+message MsgUpdateCrosschainFlagsResponse {}
 
 message MsgUpdateKeygen {
   string creator = 1;