remove changes to cctx struct

zeta-chain · Mar 18, 2024 · 69e3f33 · 69e3f33
1 parent 152a3de
commit 69e3f33
Show file tree

Hide file tree

Showing 45 changed files with 1,697 additions and 4,231 deletions.
diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml
@@ -53657,11 +53657,6 @@ definitions:
         items:
           type: object
           $ref: '#/definitions/crosschainOutboundTxParams'
-      event_index:
-        type: string
-        format: uint64
-      coin_type:
-        $ref: '#/definitions/commonCoinType'
   crosschainGasPrice:
     type: object
     properties:
@@ -53720,6 +53715,8 @@ definitions:
       tx_origin:
         type: string
         title: this address is the EOA that signs the inbound tx
+      coin_type:
+        $ref: '#/definitions/commonCoinType'
       asset:
         type: string
         title: for ERC20 coin type, the asset is an address of the ERC20 contract
@@ -53810,6 +53807,8 @@ definitions:
       receiver_chainId:
         type: string
         format: int64
+      coin_type:
+        $ref: '#/definitions/commonCoinType'
       amount:
         type: string
       outbound_tx_tss_nonce:

diff --git a/proto/crosschain/cross_chain_tx.proto b/proto/crosschain/cross_chain_tx.proto
@@ -27,6 +27,7 @@ message InboundTxParams {
   string sender = 1; // this address is the immediate contract/EOA that calls the Connector.send()
   int64 sender_chain_id = 2;
   string tx_origin = 3; // this address is the EOA that signs the inbound tx
+  common.CoinType coin_type = 4;
   string asset = 5; // for ERC20 coin type, the asset is an address of the ERC20 contract
   string amount = 6 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint",
@@ -50,6 +51,7 @@ message ZetaAccounting {
 message OutboundTxParams {
   string receiver = 1;
   int64 receiver_chainId = 2;
+  common.CoinType coin_type = 3;
   string amount = 4 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint",
     (gogoproto.nullable) = false
@@ -91,6 +93,4 @@ message CrossChainTx {
   Status cctx_status = 8;
   InboundTxParams inbound_tx_params = 9;
   repeated OutboundTxParams outbound_tx_params = 10;
-  uint64 event_index = 11;
-  common.CoinType coin_type = 12;
 }
diff --git a/proto/crosschain/cross_chain_tx_v14.proto b/proto/crosschain/cross_chain_tx_v14.proto
diff --git a/testutil/sample/crosschain.go b/testutil/sample/crosschain.go
@@ -48,6 +48,7 @@ func InboundTxParams(r *rand.Rand) *types.InboundTxParams {
 		InboundTxObservedExternalHeight: r.Uint64(),
 		InboundTxBallotIndex:            StringRandom(r, 32),
 		InboundTxFinalizedZetaHeight:    r.Uint64(),
+		CoinType:                        common.CoinType(r.Intn(100)),
 	}
 }
 
@@ -78,6 +79,7 @@ func OutboundTxParams(r *rand.Rand) *types.OutboundTxParams {
 		OutboundTxObservedExternalHeight: r.Uint64(),
 		OutboundTxGasUsed:                r.Uint64(),
 		OutboundTxEffectiveGasPrice:      math.NewInt(r.Int63()),
+		CoinType:                         common.CoinType(r.Intn(100)),
 	}
 }
 
@@ -117,13 +119,11 @@ func CrossChainTx(t *testing.T, index string) *types.CrossChainTx {
 	return &types.CrossChainTx{
 		Creator:          AccAddress(),
 		Index:            GetCctxIndexFromString(index),
-		CoinType:         common.CoinType(r.Intn(100)),
 		ZetaFees:         math.NewUint(uint64(r.Int63())),
 		RelayedMessage:   StringRandom(r, 32),
 		CctxStatus:       Status(t, index),
 		InboundTxParams:  InboundTxParams(r),
 		OutboundTxParams: []*types.OutboundTxParams{OutboundTxParams(r), OutboundTxParams(r)},
-		EventIndex:       r.Uint64(),
 	}
 }
 

diff --git a/testutil/sample/crosschain_legacy.go b/testutil/sample/crosschain_legacy.go
diff --git a/typescript/crosschain/cross_chain_tx_pb.d.ts b/typescript/crosschain/cross_chain_tx_pb.d.ts
@@ -103,6 +103,11 @@ export declare class InboundTxParams extends Message<InboundTxParams> {
    */
   txOrigin: string;
 
+  /**
+   * @generated from field: common.CoinType coin_type = 4;
+   */
+  coinType: CoinType;
+
   /**
    * for ERC20 coin type, the asset is an address of the ERC20 contract
    *
@@ -195,6 +200,11 @@ export declare class OutboundTxParams extends Message<OutboundTxParams> {
    */
   receiverChainId: bigint;
 
+  /**
+   * @generated from field: common.CoinType coin_type = 3;
+   */
+  coinType: CoinType;
+
   /**
    * @generated from field: string amount = 4;
    */
@@ -353,16 +363,6 @@ export declare class CrossChainTx extends Message<CrossChainTx> {
    */
   outboundTxParams: OutboundTxParams[];
 
-  /**
-   * @generated from field: uint64 event_index = 11;
-   */
-  eventIndex: bigint;
-
-  /**
-   * @generated from field: common.CoinType coin_type = 12;
-   */
-  coinType: CoinType;
-
   constructor(data?: PartialMessage<CrossChainTx>);
 
   static readonly runtime: typeof proto3;