fix: avoid posting uncessary outtx confirmation (#16)

* avoid posting uncessary outtx confirmation

* updated changelog.md

* added ballot identifier in log prints

* unified tx hash variable names

* updated changelog

* updated changelog

Author: ws4charlie

changelog.md

@@ -14,6 +14,7 @@
 * prevent deposits for paused zrc20
 * [1406](https://github.com/zeta-chain/node/pull/1406) - improve log prints and speed up evm outtx inclusion
 * fix Athens-3 issue - include bitcoin outtx regardless of the cctx status
+* fix Athens-3 log print issue - avoid posting uncessary outtx confirmation
 
 ### Refactoring
 

docs/openapi/openapi.swagger.yaml

@@ -27861,6 +27861,30 @@ paths:
             $ref: '#/definitions/googlerpcStatus'
       tags:
         - Query
+  /zeta-chain/observer/has_voted/{ballot_identifier}/{voter_address}:
+    get:
+      summary: Query if a voter has voted for a ballot
+      operationId: Query_HasVoted
+      responses:
+        "200":
+          description: A successful response.
+          schema:
+            $ref: '#/definitions/observerQueryHasVotedResponse'
+        default:
+          description: An unexpected error response.
+          schema:
+            $ref: '#/definitions/googlerpcStatus'
+      parameters:
+        - name: ballot_identifier
+          in: path
+          required: true
+          type: string
+        - name: voter_address
+          in: path
+          required: true
+          type: string
+      tags:
+        - Query
   /zeta-chain/observer/keygen:
     get:
       summary: Queries a keygen by index.
@@ -51524,6 +51548,11 @@ definitions:
     properties:
       node_account:
         $ref: '#/definitions/observerNodeAccount'
+  observerQueryHasVotedResponse:
+    type: object
+    properties:
+      has_voted:
+        type: boolean
   observerQueryObserversByChainResponse:
     type: object
     properties:

proto/observer/query.proto

@@ -22,6 +22,10 @@ service Query {
   rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
     option (google.api.http).get = "/zeta-chain/observer/params";
   }
+  // Query if a voter has voted for a ballot
+  rpc HasVoted(QueryHasVotedRequest) returns (QueryHasVotedResponse) {
+    option (google.api.http).get = "/zeta-chain/observer/has_voted/{ballot_identifier}/{voter_address}";
+  }
   // Queries a list of VoterByIdentifier items.
   rpc BallotByIdentifier(QueryBallotByIdentifierRequest) returns (QueryBallotByIdentifierResponse) {
     option (google.api.http).get = "/zeta-chain/observer/ballot_by_identifier/{ballot_identifier}";
@@ -124,6 +128,15 @@ message QueryParamsResponse {
   Params params = 1 [(gogoproto.nullable) = false];
 }
 
+message QueryHasVotedRequest {
+  string ballot_identifier = 1;
+  string voter_address = 2;
+}
+
+message QueryHasVotedResponse {
+  bool has_voted = 1;
+}
+
 message QueryBallotByIdentifierRequest {
   string ballot_identifier = 1;
 }

typescript/observer/query_pb.d.ts

@@ -131,6 +131,59 @@ export declare class QueryParamsResponse extends Message<QueryParamsResponse> {
   static equals(a: QueryParamsResponse | PlainMessage<QueryParamsResponse> | undefined, b: QueryParamsResponse | PlainMessage<QueryParamsResponse> | undefined): boolean;
 }
 
+/**
+ * @generated from message zetachain.zetacore.observer.QueryHasVotedRequest
+ */
+export declare class QueryHasVotedRequest extends Message<QueryHasVotedRequest> {
+  /**
+   * @generated from field: string ballot_identifier = 1;
+   */
+  ballotIdentifier: string;
+
+  /**
+   * @generated from field: string voter_address = 2;
+   */
+  voterAddress: string;
+
+  constructor(data?: PartialMessage<QueryHasVotedRequest>);
+
+  static readonly runtime: typeof proto3;
+  static readonly typeName = "zetachain.zetacore.observer.QueryHasVotedRequest";
+  static readonly fields: FieldList;
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): QueryHasVotedRequest;
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): QueryHasVotedRequest;
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): QueryHasVotedRequest;
+
+  static equals(a: QueryHasVotedRequest | PlainMessage<QueryHasVotedRequest> | undefined, b: QueryHasVotedRequest | PlainMessage<QueryHasVotedRequest> | undefined): boolean;
+}
+
+/**
+ * @generated from message zetachain.zetacore.observer.QueryHasVotedResponse
+ */
+export declare class QueryHasVotedResponse extends Message<QueryHasVotedResponse> {
+  /**
+   * @generated from field: bool has_voted = 1;
+   */
+  hasVoted: boolean;
+
+  constructor(data?: PartialMessage<QueryHasVotedResponse>);
+
+  static readonly runtime: typeof proto3;
+  static readonly typeName = "zetachain.zetacore.observer.QueryHasVotedResponse";
+  static readonly fields: FieldList;
+
+  static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): QueryHasVotedResponse;
+
+  static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): QueryHasVotedResponse;
+
+  static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): QueryHasVotedResponse;
+
+  static equals(a: QueryHasVotedResponse | PlainMessage<QueryHasVotedResponse> | undefined, b: QueryHasVotedResponse | PlainMessage<QueryHasVotedResponse> | undefined): boolean;
+}
+
 /**
  * @generated from message zetachain.zetacore.observer.QueryBallotByIdentifierRequest
  */

x/observer/keeper/ballot.go

@@ -77,6 +77,24 @@ func (k Keeper) GetMaturedBallotList(ctx sdk.Context) []string {
 
 // Queries
 
+func (k Keeper) HasVoted(goCtx context.Context, req *types.QueryHasVotedRequest) (*types.QueryHasVotedResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	ballot, found := k.GetBallot(ctx, req.BallotIdentifier)
+	if !found {
+		return &types.QueryHasVotedResponse{
+			HasVoted: false,
+		}, nil
+	}
+	hasVoted := ballot.HasVoted(req.VoterAddress)
+
+	return &types.QueryHasVotedResponse{
+		HasVoted: hasVoted,
+	}, nil
+}
+
 func (k Keeper) BallotByIdentifier(goCtx context.Context, req *types.QueryBallotByIdentifierRequest) (*types.QueryBallotByIdentifierResponse, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "invalid request")