feat: mayachain update

gen.sh

@@ -6,12 +6,13 @@ protoc \
   --ts_proto_out="${outDir}" \
   --proto_path="./proto" \
   --proto_path="./third_party/proto" \
-  --ts_proto_opt="esModuleInterop=true,forceLong=long,useOptionals=true,exportCommonSymbols=false" \
+  --ts_proto_opt="esModuleInterop=true,forceLong=long,useOptionals=messages,exportCommonSymbols=false" \
   $(find "proto" -name '*.proto')
 
 
 # Remove unnecessary codec files
 rm -rf \
+  ${outDir}/amino/ \
   ${outDir}/cosmos_proto/ \
   ${outDir}/gogoproto/ \
   ${outDir}/google/api/ \

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/proto-tx-builder",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Builds and signs new-style protobuf SIGN_MODE_DIRECT Cosmos SDK transactions",
   "author": "ShapeShift DAO",
   "license": "MIT",
@@ -58,5 +58,3 @@
     ]
   }
 }
-
-

proto/arkeo/claim/query.proto

@@ -4,7 +4,6 @@ package arkeo.claim;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "cosmos/base/query/v1beta1/pagination.proto";
 import "arkeo/claim/params.proto";
 import "arkeo/claim/claim_record.proto";
 

proto/thorchain/v1/common/common.proto

@@ -1,43 +1,25 @@
 syntax = "proto3";
 package common;
 
-option go_package = "gitlab.com/thorchain/thornode/common";
+option go_package = "gitlab.com/thorchain/thornode/v3/common";
 option (gogoproto.goproto_stringer_all) = false;
 option (gogoproto.stringer_all)         = false;
 option (gogoproto.goproto_getters_all)  = false;
 
+import "amino/amino.proto";
 import "gogoproto/gogo.proto";
 
 message Asset {
     string chain = 1 [(gogoproto.casttype) = "Chain"];
     string symbol = 2 [(gogoproto.casttype) = "Symbol"];
     string ticker = 3 [(gogoproto.casttype) = "Ticker"];
     bool synth = 4;
+    bool trade = 5;
+    bool secured = 6;
 }
 
 message Coin {
-    Asset asset = 1 [(gogoproto.nullable) = false];
-    string amount = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint", (gogoproto.nullable) = false];
+    Asset asset = 1 [(gogoproto.jsontag) = "asset", (gogoproto.nullable) = false, (gogoproto.customtype) = "Asset", (amino.encoding) = "asset"];
+    string amount = 2 [(gogoproto.jsontag) = "amount", (gogoproto.customtype) = "cosmossdk.io/math.Uint", (gogoproto.nullable) = false];
     int64 decimals = 3;
-}
-
-// PubKeySet contains two pub keys , secp256k1 and ed25519
-message PubKeySet {
-    string secp256k1 = 1 [(gogoproto.casttype) = "PubKey", (gogoproto.customname) = "Secp256k1"];
-    string ed25519   = 2 [(gogoproto.casttype) = "PubKey"];
-}
-
-message Tx {
-    string id = 1 [(gogoproto.casttype) = "TxID", (gogoproto.customname) = "ID"];
-    string chain = 2 [(gogoproto.casttype) = "Chain"];
-    string from_address = 3 [(gogoproto.casttype) = "Address"];
-    string to_address = 4 [(gogoproto.casttype) = "Address"];
-    repeated Coin coins = 5 [(gogoproto.castrepeated) = "Coins", (gogoproto.nullable) = false];
-    repeated Coin gas = 6 [(gogoproto.castrepeated) = "Gas", (gogoproto.nullable) = false];
-    string memo = 7;
-}
-
-message Fee {
-    repeated Coin coins = 1 [(gogoproto.castrepeated) = "Coins", (gogoproto.nullable) = false];
-    string pool_deduct = 2 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Uint", (gogoproto.nullable) = false];
-}
+}

proto/thorchain/v1/types/msg_deposit.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+package types;
+
+option go_package = "gitlab.com/thorchain/thornode/v3/x/thorchain/types";
+
+import "thorchain/v1/common/common.proto";
+import "gogoproto/gogo.proto";
+import "amino/amino.proto";
+
+message MsgDeposit {
+  option (amino.name) = "thorchain/MsgDeposit";
+
+  repeated common.Coin coins = 1 [(gogoproto.castrepeated) = "gitlab.com/thorchain/thornode/v3/common.Coins", (gogoproto.nullable) = false];
+  string memo = 2;
+  bytes signer = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress", (amino.encoding) = "bech32"];
+}

proto/thorchain/v1/x/thorchain/types/msg_send.proto → proto/thorchain/v1/types/msg_send.proto

@@ -1,13 +1,16 @@
 syntax = "proto3";
 package types;
 
-option go_package = "gitlab.com/thorchain/thornode/x/thorchain/types";
+option go_package = "gitlab.com/thorchain/thornode/v3/x/thorchain/types";
 
 import "cosmos/base/v1beta1/coin.proto";
 import "gogoproto/gogo.proto";
+import "amino/amino.proto";
 
 message MsgSend {
-  bytes from_address = 1  [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
-  bytes to_address = 2  [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  option (amino.name) = "thorchain/MsgSend";
+
+  bytes from_address = 1  [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress", (amino.encoding) = "bech32"];
+  bytes to_address = 2  [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress", (amino.encoding) = "bech32"];
   repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false];
 }