in progress

osmosis-labs · Oct 18, 2021 · 63cc9ba · 63cc9ba
1 parent 6fed296
commit 63cc9ba
Show file tree

Hide file tree

Showing 9 changed files with 755 additions and 257 deletions.
diff --git a/proto/osmosis/txfees/feetoken.proto → proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/feetoken.proto → proto/osmosis/txfees/v1beta1/feetoken.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package osmosislabs.osmosis.txfees;
+package osmosis.txfees.v1beta1;
 
 import "gogoproto/gogo.proto";
 

diff --git a/proto/osmosis/txfees/genesis.proto → proto/osmosis/txfees/v1beta1/genesis.proto b/proto/osmosis/txfees/genesis.proto → proto/osmosis/txfees/v1beta1/genesis.proto
@@ -1,7 +1,8 @@
 syntax = "proto3";
-package osmosislabs.osmosis.txfees;
+package osmosis.txfees.v1beta1;
 
 import "gogoproto/gogo.proto";
+import "osmosis/txfees/v1beta1/feetoken.proto";
 
 option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types";
 

diff --git a/proto/osmosis/txfees/gov.proto → proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/gov.proto → proto/osmosis/txfees/v1beta1/gov.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package osmosis.poolincentives.v1beta1;
+package osmosis.txfees.v1beta1;
 
 import "gogoproto/gogo.proto";
-import "osmosis/pool-incentives/v1beta1/incentives.proto";
+import "osmosis/txfees/v1beta1/feetoken.proto";
 
-option go_package = "github.com/osmosis-labs/osmosis/x/pool-incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types";
 
 // UpdateFeeTokenProposal is a gov Content type for adding a new whitelisted fee
 // token It must specify a denom along with gamm pool ID to use as a spot price

diff --git a/proto/osmosis/txfees/query.proto → proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/query.proto → proto/osmosis/txfees/v1beta1/query.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package osmosislabs.osmosis.txfees;
+package osmosis.txfees.v1beta1;
 
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";

diff --git a/x/txfees/types/feetoken.pb.go b/x/txfees/types/feetoken.pb.go