Merge pull request #267 from notional-labs/dang-fix-query-prop

Fix query proposals
ComposableFi · Nov 10, 2023 · afc58a7 · afc58a7
2 parents e3de1f4 + cf2efa8
commit afc58a7
Show file tree

Hide file tree

Showing 44 changed files with 858 additions and 865 deletions.
diff --git a/proto/composable/mint/v1beta1/genesis.proto → proto/centauri/mint/v1beta1/genesis.proto b/proto/composable/mint/v1beta1/genesis.proto → proto/centauri/mint/v1beta1/genesis.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
-package composable.mint.v1beta1;
+package centauri.mint.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "composable/mint/v1beta1/mint.proto";
+import "centauri/mint/v1beta1/mint.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "x/mint/types";

diff --git a/proto/composable/mint/v1beta1/mint.proto → proto/centauri/mint/v1beta1/mint.proto b/proto/composable/mint/v1beta1/mint.proto → proto/centauri/mint/v1beta1/mint.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.mint.v1beta1;
+package centauri.mint.v1beta1;
 
 option go_package = "x/mint/types";
 

diff --git a/proto/composable/mint/v1beta1/query.proto → proto/centauri/mint/v1beta1/query.proto b/proto/composable/mint/v1beta1/query.proto → proto/centauri/mint/v1beta1/query.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
-package composable.mint.v1beta1;
+package centauri.mint.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "composable/mint/v1beta1/mint.proto";
+import "centauri/mint/v1beta1/mint.proto";
 
 option go_package = "x/mint/types";
 

diff --git a/proto/composable/mint/v1beta1/tx.proto → proto/centauri/mint/v1beta1/tx.proto b/proto/composable/mint/v1beta1/tx.proto → proto/centauri/mint/v1beta1/tx.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
-package composable.mint.v1beta1;
+package centauri.mint.v1beta1;
 
 import "cosmos/msg/v1/msg.proto";
 import "amino/amino.proto";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
-import "composable/mint/v1beta1/mint.proto";
+import "centauri/mint/v1beta1/mint.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "x/mint/types";

diff --git a/.../composable/ratelimit/v1beta1/epoch.proto → proto/centauri/ratelimit/v1beta1/epoch.proto b/.../composable/ratelimit/v1beta1/epoch.proto → proto/centauri/ratelimit/v1beta1/epoch.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";

diff --git a/...omposable/ratelimit/v1beta1/genesis.proto → .../centauri/ratelimit/v1beta1/genesis.proto b/...omposable/ratelimit/v1beta1/genesis.proto → .../centauri/ratelimit/v1beta1/genesis.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "composable/ratelimit/v1beta1/params.proto";
-import "composable/ratelimit/v1beta1/ratelimit.proto";
-import "composable/ratelimit/v1beta1/epoch.proto";
+import "centauri/ratelimit/v1beta1/params.proto";
+import "centauri/ratelimit/v1beta1/ratelimit.proto";
+import "centauri/ratelimit/v1beta1/epoch.proto";
 
 option go_package = "x/ratelimit/types";
 

diff --git a/...composable/ratelimit/v1beta1/params.proto → ...o/centauri/ratelimit/v1beta1/params.proto b/...composable/ratelimit/v1beta1/params.proto → ...o/centauri/ratelimit/v1beta1/params.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
 option go_package = "x/ratelimit/types";
 

diff --git a/.../composable/ratelimit/v1beta1/query.proto → proto/centauri/ratelimit/v1beta1/query.proto b/.../composable/ratelimit/v1beta1/query.proto → proto/centauri/ratelimit/v1beta1/query.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
-import "composable/ratelimit/v1beta1/ratelimit.proto";
+import "centauri/ratelimit/v1beta1/ratelimit.proto";
 import "google/api/annotations.proto";
 import "gogoproto/gogo.proto";
 
@@ -11,26 +11,26 @@ option go_package = "x/ratelimit/types";
 service Query {
   rpc AllRateLimits(QueryAllRateLimitsRequest)
       returns (QueryAllRateLimitsResponse) {
-    option (google.api.http).get = "/composable/ratelimit/ratelimits";
+    option (google.api.http).get = "/centauri/ratelimit/ratelimits";
   }
   rpc RateLimit(QueryRateLimitRequest) returns (QueryRateLimitResponse) {
     option (google.api.http).get =
-        "/composable/ratelimit/ratelimit/{ChannelID}/by_denom";
+        "/centauri/ratelimit/ratelimit/{ChannelID}/by_denom";
   }
   rpc RateLimitsByChainID(QueryRateLimitsByChainIDRequest)
       returns (QueryRateLimitsByChainIDResponse) {
     option (google.api.http).get =
-        "/composable/ratelimit/ratelimits/{chain_id}";
+        "/centauri/ratelimit/ratelimits/{chain_id}";
   }
   rpc RateLimitsByChannelID(QueryRateLimitsByChannelIDRequest)
       returns (QueryRateLimitsByChannelIDResponse) {
     option (google.api.http).get =
-        "/composable/ratelimit/ratelimits/{ChannelID}";
+        "/centauri/ratelimit/ratelimits/{ChannelID}";
   }
   rpc AllWhitelistedAddresses(QueryAllWhitelistedAddressesRequest)
       returns (QueryAllWhitelistedAddressesResponse) {
     option (google.api.http).get =
-        "/composable/ratelimit/whitelisted_addresses";
+        "/centauri/ratelimit/whitelisted_addresses";
   }
 }
 

diff --git a/...posable/ratelimit/v1beta1/ratelimit.proto → ...entauri/ratelimit/v1beta1/ratelimit.proto b/...posable/ratelimit/v1beta1/ratelimit.proto → ...entauri/ratelimit/v1beta1/ratelimit.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
 import "gogoproto/gogo.proto";
 

diff --git a/proto/composable/ratelimit/v1beta1/tx.proto → proto/centauri/ratelimit/v1beta1/tx.proto b/proto/composable/ratelimit/v1beta1/tx.proto → proto/centauri/ratelimit/v1beta1/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.ratelimit.v1beta1;
+package centauri.ratelimit.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/msg/v1/msg.proto";

diff --git a/.../transfermiddleware/v1beta1/genesis.proto → .../transfermiddleware/v1beta1/genesis.proto b/.../transfermiddleware/v1beta1/genesis.proto → .../transfermiddleware/v1beta1/genesis.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
-package composable.transfermiddleware.v1beta1;
+package centauri.transfermiddleware.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "composable/transfermiddleware/v1beta1/params.proto";
-import "composable/transfermiddleware/v1beta1/parachain_token_info.proto";
+import "centauri/transfermiddleware/v1beta1/params.proto";
+import "centauri/transfermiddleware/v1beta1/parachain_token_info.proto";
 
 option go_package = "x/transfermiddleware/types";
 

diff --git a/...leware/v1beta1/parachain_token_info.proto → ...leware/v1beta1/parachain_token_info.proto b/...leware/v1beta1/parachain_token_info.proto → ...leware/v1beta1/parachain_token_info.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.transfermiddleware.v1beta1;
+package centauri.transfermiddleware.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
@@ -12,19 +12,19 @@ message ParachainIBCTokenInfo {
   // ibc_denom is the denomination of the ibced token transferred from the
   // dotsama chain.
   string ibc_denom = 1 [ (gogoproto.moretags) = "yaml:\"ibc_denom\"" ];
-  // channel_id is source channel in IBC connection from composable chain
+  // channel_id is source channel in IBC connection from centauri chain
   string channel_id = 2 [
     (gogoproto.moretags) = "yaml:\"channel_id\"",
     (gogoproto.customname) = "ChannelID"
   ];
-  // native denom is new native minted denom in composable chain.
+  // native denom is new native minted denom in centauri chain.
   string native_denom = 3 [ (gogoproto.moretags) = "yaml:\"native_denom\"" ];
   // asset id is the id of the asset on Picasso
   string asset_id = 4 [ (gogoproto.moretags) = "yaml:\"asset_id\"" ];
 }
 
 message RemoveParachainIBCTokenInfo {
-  // native denom is new native minted denom in composable chain.
+  // native denom is new native minted denom in centauri chain.
   string native_denom = 1 [ (gogoproto.moretags) = "yaml:\"native_denom\"" ];
   //
   // remove_time is the time at which the parachain token info will be removed.

diff --git a/...e/transfermiddleware/v1beta1/params.proto → ...i/transfermiddleware/v1beta1/params.proto b/...e/transfermiddleware/v1beta1/params.proto → ...i/transfermiddleware/v1beta1/params.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.transfermiddleware.v1beta1;
+package centauri.transfermiddleware.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";

diff --git a/...le/transfermiddleware/v1beta1/query.proto → ...ri/transfermiddleware/v1beta1/query.proto b/...le/transfermiddleware/v1beta1/query.proto → ...ri/transfermiddleware/v1beta1/query.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.transfermiddleware.v1beta1;
+package centauri.transfermiddleware.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
@@ -12,16 +12,16 @@ service Query {
   // ParaTokenInfo queries all token info of a native denom.
   rpc ParaTokenInfo(QueryParaTokenInfoRequest)
       returns (QueryParaTokenInfoResponse) {
-    option (google.api.http).get = "/composable/paratokeninfo";
+    option (google.api.http).get = "/centauri/paratokeninfo";
   }
   rpc EscrowAddress(QueryEscrowAddressRequest)
       returns (QueryEscrowAddressResponse) {
-    option (google.api.http).get = "/composable/escrowaddress";
+    option (google.api.http).get = "/centauri/escrowaddress";
   }
 
   rpc RelayerAccount(QueryIBCWhiteListRequest)
       returns (QueryIBCWhiteListResponse) {
-    option (google.api.http).get = "/composable/ibcwhitelist";
+    option (google.api.http).get = "/centauri/ibcwhitelist";
   }
 }
 

diff --git a/...sable/transfermiddleware/v1beta1/tx.proto → ...tauri/transfermiddleware/v1beta1/tx.proto b/...sable/transfermiddleware/v1beta1/tx.proto → ...tauri/transfermiddleware/v1beta1/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.transfermiddleware.v1beta1;
+package centauri.transfermiddleware.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "cosmos/msg/v1/msg.proto";

diff --git a/...posable/txboundary/v1beta1/boundary.proto → ...entauri/txboundary/v1beta1/boundary.proto b/...posable/txboundary/v1beta1/boundary.proto → ...entauri/txboundary/v1beta1/boundary.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package composable.txboundary.v1beta1;
+package centauri.txboundary.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";

diff --git a/...mposable/txboundary/v1beta1/genesis.proto → ...centauri/txboundary/v1beta1/genesis.proto b/...mposable/txboundary/v1beta1/genesis.proto → ...centauri/txboundary/v1beta1/genesis.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
-package composable.txboundary.v1beta1;
+package centauri.txboundary.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "composable/txboundary/v1beta1/boundary.proto";
+import "centauri/txboundary/v1beta1/boundary.proto";
 
 option go_package = "x/tx-boundary/types";
 

diff --git a/...composable/txboundary/v1beta1/query.proto → ...o/centauri/txboundary/v1beta1/query.proto b/...composable/txboundary/v1beta1/query.proto → ...o/centauri/txboundary/v1beta1/query.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
-package composable.txboundary.v1beta1;
+package centauri.txboundary.v1beta1;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "composable/txboundary/v1beta1/boundary.proto";
+import "centauri/txboundary/v1beta1/boundary.proto";
 
 option go_package = "x/tx-boundary/types";
 

diff --git a/proto/composable/txboundary/v1beta1/tx.proto → proto/centauri/txboundary/v1beta1/tx.proto b/proto/composable/txboundary/v1beta1/tx.proto → proto/centauri/txboundary/v1beta1/tx.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
-package composable.txboundary.v1beta1;
+package centauri.txboundary.v1beta1;
 
 import "cosmos/msg/v1/msg.proto";
 import "amino/amino.proto";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
-import "composable/txboundary/v1beta1/boundary.proto";
+import "centauri/txboundary/v1beta1/boundary.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
 option go_package = "x/tx-boundary/types";
@@ -26,7 +26,7 @@ service Msg {
 // Since: cosmos-sdk 0.47
 message MsgUpdateDelegateBoundary {
   option (cosmos.msg.v1.signer) = "authority";
-  option (amino.name) = "composable/x/txboundary/MsgUpdateDelegateBoundary";
+  option (amino.name) = "centauri/x/txboundary/MsgUpdateDelegateBoundary";
 
   // authority is the address that controls the module (defaults to x/gov unless
   // overwritten).
@@ -51,7 +51,7 @@ message MsgUpdateDelegateBoundaryResponse {}
 // Since: cosmos-sdk 0.47
 message MsgUpdateRedelegateBoundary {
   option (cosmos.msg.v1.signer) = "authority";
-  option (amino.name) = "composable/x/txboundary/MsgUpdateDelegateBoundary";
+  option (amino.name) = "centauri/x/txboundary/MsgUpdateDelegateBoundary";
 
   // authority is the address that controls the module (defaults to x/gov unless
   // overwritten).

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
@@ -10,7 +10,7 @@ go get github.com/regen-network/cosmos-proto/protoc-gen-gocosmos 2>/dev/null
 
 echo "Generating gogo proto code"
 cd proto
-proto_dirs=$(find ./composable -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
+proto_dirs=$(find ./centauri -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq)
 for dir in $proto_dirs; do
   for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do
     if grep go_package $file &>/dev/null; then

diff --git a/scripts/relayer_hermes/config_compose_gaia.toml b/scripts/relayer_hermes/config_compose_gaia.toml
@@ -100,7 +100,7 @@ port = 4001
 id = 'gaiad-t1'
 rpc_addr = 'http://localhost:3241'
 grpc_addr = 'http://localhost:3242'
-websocket_addr = 'ws://localhost:3241/websocket'	# ws://135.181.59.162:26657/websocket
+event_source = { mode = 'push', url = 'ws://localhost:3241/websocket', batch_delay = '500ms' }
 rpc_timeout = '10s'
 account_prefix = 'cosmos'
 key_name = 'bob'
@@ -120,7 +120,7 @@ trust_threshold = { numerator = '1', denominator = '3' }
 id = 'centaurid-t1'
 rpc_addr = 'http://127.0.0.1:2241'
 grpc_addr = 'http://127.0.0.1:2242'
-websocket_addr = 'ws://127.0.0.1:2241/websocket'
+event_source = { mode = 'push', url = 'ws://127.0.0.1:2241/websocket', batch_delay = '500ms' }
 rpc_timeout = '10s'
 account_prefix = 'centauri'
 key_name = 'alice'

diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go