Skip to content

Commit

Permalink
fix amino sign issue (#119)
Browse files Browse the repository at this point in the history 
* fix amino sign issue

* update go.mod
  • Loading branch information
@harish551
harish551 authored Dec 4, 2023
1 parent d28fe87 commit e121d59
Show file tree
Hide file tree
Showing 18 changed files with 436 additions and 552 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/OmniFlix/omniflixhub/v2
go 1.21

require (
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.2
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.3
github.com/bianjieai/nft-transfer v1.1.3-ibc-v7.3.0
github.com/cometbft/cometbft v0.37.2
github.com/cometbft/cometbft-db v0.8.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,8 @@ github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2y
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.2 h1:lJgjnpUYSumZE/QBXR1HATjOsVtLAkObyoMxxSqOY1A=
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.2/go.mod h1:U1JTcIJ9GqnSoeNX87+qVUSS+BlYpri510hJEKnGU5I=
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.3 h1:z0l6nrAc97U71dWbezDkktzVhTgjp62tIyIfEo+5vQs=
github.com/OmniFlix/streampay/v2 v2.2.0-alpha.3/go.mod h1:U1JTcIJ9GqnSoeNX87+qVUSS+BlYpri510hJEKnGU5I=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
Expand Down
1 change: 1 addition & 0 deletions proto/OmniFlix/alloc/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";

service Msg {
option (cosmos.msg.v1.service) = true;
// UpdateParams defines a governance operation for updating the x/alloc module
// parameters. The authority is hard-coded to the x/gov module account.
//
Expand Down
2 changes: 2 additions & 0 deletions proto/OmniFlix/globalfee/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ option go_package = "github.com/OmniFlix/omniflixhub/v2/x/globalfee/types";

// Msg defines the x/globalfee Msg service.
service Msg {
option (cosmos.msg.v1.service) = true;

// UpdateParams defines a governance operation for updating the x/globalfee module
// parameters. The authority is hard-coded to the x/gov module account.
//
Expand Down
19 changes: 19 additions & 0 deletions proto/OmniFlix/itc/v1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ syntax = "proto3";
package OmniFlix.itc.v1;

import "cosmos/msg/v1/msg.proto";
import "amino/amino.proto";
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
Expand All @@ -14,6 +15,8 @@ option go_package = "github.com/OmniFlix/omniflixhub/v2/x/itc/types";
option (gogoproto.goproto_getters_all) = false;

service Msg {
option (cosmos.msg.v1.service) = true;

rpc CreateCampaign(MsgCreateCampaign) returns (MsgCreateCampaignResponse);

rpc CancelCampaign(MsgCancelCampaign) returns (MsgCancelCampaignResponse);
Expand All @@ -30,6 +33,10 @@ service Msg {
}

message MsgCreateCampaign {
option (cosmos.msg.v1.signer) = "creator";
option (amino.name) = "OmniFlix/itc/MsgCreateCampaign";
option (gogoproto.equal) = false;

string name = 1;
string description = 2;
InteractionType interaction = 3;
Expand Down Expand Up @@ -69,13 +76,21 @@ message MsgCreateCampaign {
message MsgCreateCampaignResponse {}

message MsgCancelCampaign {
option (cosmos.msg.v1.signer) = "creator";
option (amino.name) = "OmniFlix/itc/MsgCancelCampaign";
option (gogoproto.equal) = false;

uint64 campaign_id = 1;
string creator = 2;
}

message MsgCancelCampaignResponse {}

message MsgClaim {
option (cosmos.msg.v1.signer) = "claimer";
option (amino.name) = "OmniFlix/itc/MsgClaim";
option (gogoproto.equal) = false;

uint64 campaign_id = 1;
string nft_id = 2;
InteractionType interaction = 3;
Expand All @@ -85,6 +100,10 @@ message MsgClaim {
message MsgClaimResponse {}

message MsgDepositCampaign {
option (cosmos.msg.v1.signer) = "depositor";
option (amino.name) = "OmniFlix/itc/MsgDepositCampaign";
option (gogoproto.equal) = false;

uint64 campaign_id = 1;
cosmos.base.v1beta1.Coin amount = 2 [(gogoproto.nullable) = false];
string depositor = 3;
Expand Down
30 changes: 30 additions & 0 deletions proto/OmniFlix/marketplace/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ syntax = "proto3";
package OmniFlix.marketplace.v1beta1;

import "cosmos/msg/v1/msg.proto";
import "amino/amino.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos_proto/cosmos.proto";
import "OmniFlix/marketplace/v1beta1/listing.proto";
Expand All @@ -15,6 +16,7 @@ option go_package = "github.com/OmniFlix/omniflixhub/v2/x/marketplace/types";
option (gogoproto.goproto_getters_all) = false;

service Msg {
option (cosmos.msg.v1.service) = true;

rpc ListNFT(MsgListNFT) returns (MsgListNFTResponse);

Expand All @@ -40,6 +42,10 @@ service Msg {


message MsgListNFT {
option (cosmos.msg.v1.signer) = "owner";
option (amino.name) = "OmniFlix/marketplace/MsgListNFT";
option (gogoproto.equal) = false;

string id = 1;
string nft_id = 2;
string denom_id = 3;
Expand All @@ -56,6 +62,10 @@ message MsgListNFT {
message MsgListNFTResponse {}

message MsgEditListing {
option (cosmos.msg.v1.signer) = "owner";
option (amino.name) = "OmniFlix/marketplace/MsgEditListing";
option (gogoproto.equal) = false;

string id = 1;
cosmos.base.v1beta1.Coin price = 2 [
(gogoproto.nullable) = false,
Expand All @@ -66,13 +76,21 @@ message MsgEditListing {
message MsgEditListingResponse {}

message MsgDeListNFT {
option (cosmos.msg.v1.signer) = "owner";
option (amino.name) = "OmniFlix/marketplace/MsgDeListNFT";
option (gogoproto.equal) = false;

string id = 1;
string owner = 2;
}

message MsgDeListNFTResponse {}

message MsgBuyNFT {
option (cosmos.msg.v1.signer) = "buyer";
option (amino.name) = "OmniFlix/marketplace/MsgBuyNFT";
option (gogoproto.equal) = false;

string id = 1;
cosmos.base.v1beta1.Coin price = 2 [
(gogoproto.nullable) = false,
Expand All @@ -84,6 +102,10 @@ message MsgBuyNFT {
message MsgBuyNFTResponse {}

message MsgCreateAuction {
option (cosmos.msg.v1.signer) = "owner";
option (amino.name) = "OmniFlix/marketplace/MsgCreateAuction";
option (gogoproto.equal) = false;

string nft_id = 1;
string denom_id = 2;
google.protobuf.Timestamp start_time = 3 [
Expand Down Expand Up @@ -118,13 +140,21 @@ message MsgCreateAuctionResponse {
}

message MsgCancelAuction {
option (cosmos.msg.v1.signer) = "owner";
option (amino.name) = "OmniFlix/marketplace/MsgCancelAuction";
option (gogoproto.equal) = false;

uint64 auction_id = 1 [(gogoproto.moretags) = "yaml:\"auction_id\""];
string owner = 2;
}

message MsgCancelAuctionResponse {}

message MsgPlaceBid {
option (cosmos.msg.v1.signer) = "bidder";
option (amino.name) = "OmniFlix/marketplace/MsgPlaceBid";
option (gogoproto.equal) = false;

uint64 auction_id = 1 [(gogoproto.moretags) = "yaml:\"auction_id\""];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.nullable) = false,
Expand Down
27 changes: 21 additions & 6 deletions proto/OmniFlix/onft/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ syntax = "proto3";
package OmniFlix.onft.v1beta1;

import "cosmos/msg/v1/msg.proto";
import "amino/amino.proto";
import "cosmos_proto/cosmos.proto";
import "OmniFlix/onft/v1beta1/params.proto";
import "cosmos/base/v1beta1/coin.proto";
Expand All @@ -12,6 +13,8 @@ option go_package = "github.com/OmniFlix/omniflixhub/v2/x/onft/types";
option (gogoproto.goproto_getters_all) = false;

service Msg {
option (cosmos.msg.v1.service) = true;

rpc CreateDenom(MsgCreateDenom) returns (MsgCreateDenomResponse);

rpc UpdateDenom(MsgUpdateDenom) returns (MsgUpdateDenomResponse);
Expand All @@ -32,7 +35,9 @@ service Msg {
}

message MsgCreateDenom {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgCreateDenom";
option (gogoproto.equal) = false;

string id = 1;
string symbol = 2;
Expand All @@ -57,7 +62,9 @@ message MsgCreateDenom {
message MsgCreateDenomResponse {}

message MsgUpdateDenom {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgUpdateDenom";
option (gogoproto.equal) = false;

string id = 1;
string name = 2;
Expand All @@ -72,7 +79,9 @@ message MsgUpdateDenom {
message MsgUpdateDenomResponse {}

message MsgTransferDenom {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgTransferDenom";
option (gogoproto.equal) = false;

string id = 1;
string sender = 2;
Expand All @@ -82,7 +91,9 @@ message MsgTransferDenom {
message MsgTransferDenomResponse {}

message MsgMintONFT {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgMintONFT";
option (gogoproto.equal) = false;

string id = 1;
string denom_id = 2 [(gogoproto.moretags) = "yaml:\"denom_id\""];
Expand All @@ -103,7 +114,9 @@ message MsgMintONFT {
message MsgMintONFTResponse {}

message MsgTransferONFT {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgTransferONFT";
option (gogoproto.equal) = false;

string id = 1;
string denom_id = 2 [(gogoproto.moretags) = "yaml:\"denom_id\""];
Expand All @@ -114,7 +127,9 @@ message MsgTransferONFT {
message MsgTransferONFTResponse {}

message MsgBurnONFT {
option (gogoproto.equal) = true;
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "OmniFlix/onft/MsgBurnONFT";
option (gogoproto.equal) = false;

string id = 1;
string denom_id = 2 [(gogoproto.moretags) = "yaml:\"denom_id\""];
Expand Down
24 changes: 24 additions & 0 deletions proto/osmosis/tokenfactory/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@ import "cosmos/base/v1beta1/coin.proto";
import "cosmos/bank/v1beta1/bank.proto";
import "osmosis/tokenfactory/v1beta1/params.proto";
import "cosmos/msg/v1/msg.proto";
import "amino/amino.proto";
import "cosmos_proto/cosmos.proto";

option go_package = "github.com/OmniFlix/omniflixhub/v2/x/tokenfactory/types";

// Msg defines the tokefactory module's gRPC message service.
service Msg {
option (cosmos.msg.v1.service) = true;

rpc CreateDenom(MsgCreateDenom) returns (MsgCreateDenomResponse);
rpc Mint(MsgMint) returns (MsgMintResponse);
rpc Burn(MsgBurn) returns (MsgBurnResponse);
Expand All @@ -37,6 +40,10 @@ service Msg {
// originally set to be the creator, but this can be changed later. The token
// denom does not indicate the current admin.
message MsgCreateDenom {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/create-denom";
option (gogoproto.equal) = false;

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
// subdenom can be up to 44 "alphanumeric" characters long.
string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ];
Expand All @@ -52,6 +59,10 @@ message MsgCreateDenomResponse {
// MsgMint is the sdk.Msg type for allowing an admin account to mint
// more of a token. For now, we only support minting to the sender account
message MsgMint {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/mint";
option (gogoproto.equal) = false;

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
Expand All @@ -66,6 +77,10 @@ message MsgMintResponse {}
// MsgBurn is the sdk.Msg type for allowing an admin account to burn
// a token. For now, we only support burning from the sender account.
message MsgBurn {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/burn";
option (gogoproto.equal) = false;

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
Expand All @@ -80,6 +95,10 @@ message MsgBurnResponse {}
// MsgChangeAdmin is the sdk.Msg type for allowing an admin account to reassign
// adminship of a denom to a new account
message MsgChangeAdmin {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/change-admin";
option (gogoproto.equal) = false;

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ];
Expand All @@ -92,6 +111,7 @@ message MsgChangeAdminResponse {}
// MsgSetDenomMetadata is the sdk.Msg type for allowing an admin account to set
// the denom's bank metadata
message MsgSetDenomMetadata {

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
cosmos.bank.v1beta1.Metadata metadata = 2 [
(gogoproto.moretags) = "yaml:\"metadata\"",
Expand All @@ -104,6 +124,10 @@ message MsgSetDenomMetadata {
message MsgSetDenomMetadataResponse {}

message MsgForceTransfer {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/force-transfer";
option (gogoproto.equal) = false;

string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
Expand Down
16 changes: 8 additions & 8 deletions x/alloc/types/tx.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e121d59

Please sign in to comment.