Skip to content

Commit

Permalink
clear deps and setup (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
beer-1 authored Jan 15, 2025
1 parent 3d3584c commit b41cc8d
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 38 deletions.
1 change: 1 addition & 0 deletions cmd/minitiad/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ func initAppConfig() (string, interface{}) {
srvCfg.MinGasPrices = fmt.Sprintf("0%s", types.BaseDenom)
srvCfg.Mempool.MaxTxs = 2000
srvCfg.QueryGasLimit = 3000000
srvCfg.InterBlockCache = false

// Enable API and unsafe CORS (CORS allowed from any host)
srvCfg.API.Enable = true
Expand Down
14 changes: 8 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ require (
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
github.com/cosmos/iavl v1.2.2 // indirect
github.com/cosmos/ics23/go v0.11.0 // indirect
github.com/cosmos/interchain-security/v6 v6.0.0 // indirect
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
Expand Down Expand Up @@ -217,7 +216,6 @@ require (
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/strangelove-ventures/cometbft-client v0.1.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
Expand Down Expand Up @@ -260,6 +258,7 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

// cosmos repalces
replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0
Expand All @@ -277,14 +276,17 @@ replace (
github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
)

// indirect custom dependencies
require (
github.com/cosmos/iavl v1.2.4 // indirect
github.com/strangelove-ventures/cometbft-client v0.1.1 // indirect
)

// initia custom
replace (
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20241224101634-a905db74416a
github.com/cometbft/cometbft => github.com/initia-labs/cometbft v0.0.0-20250109053429-822f3def6a97
github.com/cosmos/ibc-go/v8 => github.com/initia-labs/ibc-go/v8 v8.0.0-20240802003717-19c0b4ad450d

// use custom version until this PR is merged
// - https://github.com/strangelove-ventures/cometbft-client/pull/10
github.com/strangelove-ventures/cometbft-client => github.com/initia-labs/cometbft-client v0.0.0-20240924071428-ef115cefa07e
// cosmos/relayer seems having problem with the latest version of grpc; return nil in the below line
// - https://github.com/cosmos/relayer/blob/4e4e9530800d28fb2c984f1cfc7b03f05eec618c/relayer/chains/cosmos/grpc_query.go#L30
google.golang.org/grpc => google.golang.org/grpc v1.65.0
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ
github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU=
github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
github.com/cosmos/gogoproto v1.7.0/go.mod h1:yWChEv5IUEYURQasfyBW5ffkMHR/90hiHgbNgrtp4j0=
github.com/cosmos/iavl v1.2.2 h1:qHhKW3I70w+04g5KdsdVSHRbFLgt3yY3qTMd4Xa4rC8=
github.com/cosmos/iavl v1.2.2/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/iavl v1.2.4 h1:IHUrG8dkyueKEY72y92jajrizbkZKPZbMmG14QzsEkw=
github.com/cosmos/iavl v1.2.4/go.mod h1:GiM43q0pB+uG53mLxLDzimxM9l/5N9UuSY3/D0huuVw=
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2 h1:dyLNlDElY6+5zW/BT/dO/3Ad9FpQblfh+9dQpYQodbA=
github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8 v8.0.2/go.mod h1:82hPO/tRawbuFad2gPwChvpZ0JEIoNi91LwVneAYCeM=
github.com/cosmos/ibc-apps/modules/rate-limiting/v8 v8.0.0 h1:AQO9NIAP3RFqvBCj7IqM/V1LCxmuvcvGUdu0RIEz/c0=
Expand Down Expand Up @@ -1429,10 +1429,8 @@ github.com/initia-labs/OPinit v0.6.2 h1:XGf++xIKhLSZS+y7S05pnHiAAuG2GrZuh12noN0m
github.com/initia-labs/OPinit v0.6.2/go.mod h1:e+ASISXctMJE2Tw2zisNWIEVnxgV9SogZHoZddcgg2w=
github.com/initia-labs/OPinit/api v0.6.2 h1:nU9Rv5s/6WbV3CfmNnW3MSSmqpk7Avgfd68qMWjYD08=
github.com/initia-labs/OPinit/api v0.6.2/go.mod h1:gHK6DEWb3/DqQD5LjKirUx9jilAh2UioXanoQdgqVfU=
github.com/initia-labs/cometbft v0.0.0-20241224101634-a905db74416a h1:qQP2cQhsZ+YyPJ0aayQr/LVva+3TbhSaBnplj0etnF8=
github.com/initia-labs/cometbft v0.0.0-20241224101634-a905db74416a/go.mod h1:9Jv7s3Z8ukB0YpH4P6PrsL5DVadnoIIL9XDToIinx9A=
github.com/initia-labs/cometbft-client v0.0.0-20240924071428-ef115cefa07e h1:k+pg63SFozCAK4LZFSiZtof6z69Tlu0O/Zftj1aAwes=
github.com/initia-labs/cometbft-client v0.0.0-20240924071428-ef115cefa07e/go.mod h1:aVposiPW9FOUeAeJ7JjJRdE3g+L6i8YDxFn6Cv6+Az4=
github.com/initia-labs/cometbft v0.0.0-20250109053429-822f3def6a97 h1:yeQYzr1UhsX+xNq8z35evLqmEjDod4DHGhLoobdRpHs=
github.com/initia-labs/cometbft v0.0.0-20250109053429-822f3def6a97/go.mod h1:9Jv7s3Z8ukB0YpH4P6PrsL5DVadnoIIL9XDToIinx9A=
github.com/initia-labs/ibc-go/v8 v8.0.0-20240802003717-19c0b4ad450d h1:TLq8lB1PtQ0pjGf+bN8YgGVeLMuytZ26SBGMOs1seKY=
github.com/initia-labs/ibc-go/v8 v8.0.0-20240802003717-19c0b4ad450d/go.mod h1:zh6x1osR0hNvEcFrC/lhGD08sMfQmr9wHVvZ/mRWMCs=
github.com/initia-labs/initia v0.6.4 h1:61ERWEW888b0IEqI9LQUkD1ztmOtRY74nOPsuKVnJWM=
Expand Down Expand Up @@ -1776,6 +1774,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
github.com/strangelove-ventures/cometbft-client v0.1.1 h1:chBZCTcTOGl3i+CjXWU+kIJZ7s6mY2uZ1gzwr7W2f0g=
github.com/strangelove-ventures/cometbft-client v0.1.1/go.mod h1:aVposiPW9FOUeAeJ7JjJRdE3g+L6i8YDxFn6Cv6+Az4=
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
Expand Down
49 changes: 23 additions & 26 deletions proto/miniwasm/tokenfactory/v1/tx.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ syntax = "proto3";
package miniwasm.tokenfactory.v1;

import "amino/amino.proto";
import "cosmos_proto/cosmos.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/bank/v1beta1/bank.proto";
import "cosmos/base/v1beta1/coin.proto";
import "cosmos/msg/v1/msg.proto";
import "cosmos_proto/cosmos.proto";
import "gogoproto/gogo.proto";
import "miniwasm/tokenfactory/v1/params.proto";

Expand All @@ -30,13 +30,11 @@ service Msg {

// SetDenomMetadata defines a gRPC service method for setting the metadata of
// a denom.
rpc SetDenomMetadata(MsgSetDenomMetadata)
returns (MsgSetDenomMetadataResponse);
rpc SetDenomMetadata(MsgSetDenomMetadata) returns (MsgSetDenomMetadataResponse);

// SetBeforeSendHook defines a gRPC service method for setting the before send
// hook of a denom.
rpc SetBeforeSendHook(MsgSetBeforeSendHook)
returns (MsgSetBeforeSendHookResponse);
rpc SetBeforeSendHook(MsgSetBeforeSendHook) returns (MsgSetBeforeSendHookResponse);

// ForceTransfer defines a gRPC service method for transferring a token from
// one account to another.
Expand All @@ -61,16 +59,15 @@ message MsgCreateDenom {

option (amino.name) = "tokenfactory/MsgCreateDenom";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
// subdenom can be up to 44 "alphanumeric" characters long.
string subdenom = 2 [ (gogoproto.moretags) = "yaml:\"subdenom\"" ];
string subdenom = 2 [(gogoproto.moretags) = "yaml:\"subdenom\""];
}

// MsgCreateDenomResponse is the return value of MsgCreateDenom
// It returns the full string of the newly created denom
message MsgCreateDenomResponse {
string new_token_denom = 1
[ (gogoproto.moretags) = "yaml:\"new_token_denom\"" ];
string new_token_denom = 1 [(gogoproto.moretags) = "yaml:\"new_token_denom\""];
}

// MsgMint is the sdk.Msg type for allowing an admin account to mint
Expand All @@ -81,7 +78,7 @@ message MsgMint {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgMint";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false
Expand All @@ -104,7 +101,7 @@ message MsgBurn {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgBurn";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false
Expand All @@ -125,9 +122,9 @@ message MsgChangeAdmin {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgChangeAdmin";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string new_admin = 3 [ (gogoproto.moretags) = "yaml:\"new_admin\"" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
string new_admin = 3 [(gogoproto.moretags) = "yaml:\"new_admin\""];
}

// MsgChangeAdminResponse defines the response structure for an executed
Expand All @@ -140,8 +137,8 @@ message MsgSetBeforeSendHook {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgSetBeforeSendHook";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string denom = 2 [ (gogoproto.moretags) = "yaml:\"denom\"" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
string denom = 2 [(gogoproto.moretags) = "yaml:\"denom\""];
string cosmwasm_address = 3 [
(gogoproto.moretags) = "yaml:\"cosmwasm_address\"",
(amino.dont_omitempty) = true
Expand All @@ -158,7 +155,7 @@ message MsgSetDenomMetadata {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgSetDenomMetadata";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
cosmos.bank.v1beta1.Metadata metadata = 2 [
(gogoproto.moretags) = "yaml:\"metadata\"",
(gogoproto.nullable) = false
Expand All @@ -175,15 +172,13 @@ message MsgForceTransfer {
option (cosmos.msg.v1.signer) = "sender";
option (amino.name) = "tokenfactory/MsgForceTransfer";

string sender = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
cosmos.base.v1beta1.Coin amount = 2 [
(gogoproto.moretags) = "yaml:\"amount\"",
(gogoproto.nullable) = false
];
string transfer_from_address = 3
[ (gogoproto.moretags) = "yaml:\"transfer_from_address\"" ];
string transfer_to_address = 4
[ (gogoproto.moretags) = "yaml:\"transfer_to_address\"" ];
string transfer_from_address = 3 [(gogoproto.moretags) = "yaml:\"transfer_from_address\""];
string transfer_to_address = 4 [(gogoproto.moretags) = "yaml:\"transfer_to_address\""];
}

// MsgForceTransferResponse defines the response structure for an executed
Expand All @@ -197,12 +192,14 @@ message MsgUpdateParams {

// authority is the address that controls the module
// (defaults to x/gov unless overwritten).
string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
// params defines the x/staking parameters to update.
//
// NOTE: All parameters must be supplied.
Params params = 2
[ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
Params params = 2 [
(gogoproto.nullable) = false,
(amino.dont_omitempty) = true
];
}

// MsgUpdateParamsResponse defines the response structure for executing a
Expand Down

0 comments on commit b41cc8d

Please sign in to comment.