Skip to content

Refactoring: remove deprecated operations #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olegfomenko wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactoring: remove deprecated operations #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ef7925
removing deprecated: contract upgrade and identity default transfer o…
olegfomenko Jun 25, 2024
e4cd97b
adding doc about new operation
olegfomenko Jun 25, 2024
6460a01
fixed doc
olegfomenko Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
280 changes: 31 additions & 249 deletions docs/static/openapi.yml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gin-gonic/gin v1.8.1 // indirect
github.com/github/smimesign v0.2.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
Expand Down
1 change: 0 additions & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,6 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqG
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
Expand Down
13 changes: 0 additions & 13 deletions proto/oraclemanager/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import "oraclemanager/params.proto";
import "oraclemanager/tx.proto";
import "oraclemanager/oracle.proto";
import "rarimocore/op_transfer.proto";
import "rarimocore/op_identity_default_transfer.proto";
import "rarimocore/op_identity_gist_transfer.proto";
import "rarimocore/op_identity_state_transfer.proto";
import "rarimocore/op_worldcoin_identity_transfer.proto";
Expand All @@ -27,10 +26,6 @@ service Query {
option (google.api.http).get = "/rarimo/rarimo-core/oraclemanager/transfer";
}

rpc IdentityDefaultTransfer(QueryGetIdentityDefaultTransferRequest) returns (QueryGetIdentityDefaultTransferResponse) {
option (google.api.http).get = "/rarimo/rarimo-core/oraclemanager/identity_default_transfer";
}

rpc IdentityGISTTransfer(QueryGetIdentityGISTTransferRequest) returns (QueryGetIdentityGISTTransferResponse) {
option (google.api.http).get = "/rarimo/rarimo-core/oraclemanager/identity_gist_transfer";
}
Expand Down Expand Up @@ -75,14 +70,6 @@ message QueryGetTransferResponse {
rarimo.rarimocore.rarimocore.Transfer transfer = 1 [(gogoproto.nullable) = false];
}

message QueryGetIdentityDefaultTransferRequest {
rarimo.rarimocore.oraclemanager.MsgCreateIdentityDefaultTransferOp msg = 1 [(gogoproto.nullable) = false];
}

message QueryGetIdentityDefaultTransferResponse {
rarimo.rarimocore.rarimocore.IdentityDefaultTransfer transfer = 1 [(gogoproto.nullable) = false];
}

message QueryGetIdentityGISTTransferRequest {
rarimo.rarimocore.oraclemanager.MsgCreateIdentityGISTTransferOp msg = 1 [(gogoproto.nullable) = false];
}
Expand Down
30 changes: 0 additions & 30 deletions proto/oraclemanager/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ service Msg {
rpc Stake(MsgStake) returns (MsgStakeResponse);
rpc Unstake(MsgUnstake) returns (MsgUnstakeResponse);
rpc CreateTransferOperation(MsgCreateTransferOp) returns (MsgCreateTransferOpResponse);
// Deprecated: consider using separate state and gist transfer operations.
rpc CreateIdentityDefaultTransferOperation(MsgCreateIdentityDefaultTransferOp) returns (MsgCreateIdentityDefaultTransferOpResponse);

rpc CreateIdentityGISTTransferOperation(MsgCreateIdentityGISTTransferOp) returns (MsgCreateIdentityGISTTransferOpResponse);
rpc CreateIdentityStateTransferOperation(MsgCreateIdentityStateTransferOp) returns (MsgCreateIdentityStateTransferOpResponse);
rpc CreateWorldCoinIdentityTransferOperation(MsgCreateWorldCoinIdentityTransferOp) returns (MsgCreateWorldCoinIdentityTransferOpResponse);
Expand Down Expand Up @@ -59,33 +56,6 @@ message MsgCreateTransferOp {

message MsgCreateTransferOpResponse {}

message MsgCreateIdentityDefaultTransferOp {
string creator = 1;
// Hex 0x
string contract = 2;
string chain = 3;
// Hex 0x
string GISTHash = 4;
// Hex 0x
string id = 5;
// Hex 0x
string stateHash = 6;
// Dec
string stateCreatedAtTimestamp = 7;
string stateCreatedAtBlock = 8;
// Hex 0x
string stateReplacedBy = 11;
string GISTReplacedBy = 12;
// Dec
string GISTCreatedAtTimestamp = 13;
string GISTCreatedAtBlock = 14;
// HEx 0x
string replacedStateHash = 17;
string replacedGISTtHash = 18;
}

message MsgCreateIdentityDefaultTransferOpResponse {}

message MsgCreateIdentityGISTTransferOp {
string creator = 1;
// Hex 0x
Expand Down
24 changes: 0 additions & 24 deletions proto/rarimocore/op_contract_upgrade.proto
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions proto/rarimocore/op_identity_default_transfer.proto
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions proto/rarimocore/operation.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ enum OpType {
TRANSFER = 0;
CHANGE_PARTIES = 1;
FEE_TOKEN_MANAGEMENT = 2;
// Deprecated
CONTRACT_UPGRADE = 3;
// Deprecated
IDENTITY_DEFAULT_TRANSFER = 4;
IDENTITY_AGGREGATED_TRANSFER = 5;
IDENTITY_GIST_TRANSFER = 6;
Expand Down
29 changes: 0 additions & 29 deletions proto/tokenmanager/proposal.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,6 @@ import "google/protobuf/any.proto";

option go_package = "github.com/rarimo/rarimo-core/x/tokenmanager/types";

enum UpgradeType {
NONE = 0;
BASIC_IMPLEMENTATION = 1;
OTHER = 2;
}

message ContractUpgradeDetails {
// Target contract address upgrade to
string targetContract = 1;
// New contract address: used on EVM
string newImplementationContract = 2;
// byte code hash: used on Solana and Near
string hash = 3;
// Solana buffer account
string bufferAccount = 4;
// chain name according to stored in tokenmanager params
string chain = 5;
// dec nonce
string nonce = 6;
UpgradeType type = 7;
}

message UpgradeContractProposal {
string title = 1;
string description = 2;
ContractUpgradeDetails details = 4 [(gogoproto.nullable) = false];
}

message AddNetworkProposal {
string title = 1;
string description = 2;
Expand Down Expand Up @@ -82,7 +54,6 @@ message WithdrawFeeProposal {
string nonce = 6;
}


message UpdateTokenItemProposal {
string title = 1;
string description = 2;
Expand Down
32 changes: 0 additions & 32 deletions x/oraclemanager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,38 +200,6 @@ message MsgCreateTransferOp {
}
```

### CreateIdentityDefaultTransferOperation

**CreateIdentityDefaultTransferOperation** - creates Operation with type `IDENTITY_DEFAULT_TRANSFER` and `INITIALIZED`
status.

```protobuf
message MsgCreateIdentityDefaultTransferOp {
string creator = 1;
// Hex 0x
string contract = 2;
string chain = 3;
// Hex 0x
string GISTHash = 4;
// Hex 0x
string id = 5;
// Hex 0x
string stateHash = 6;
// Dec
string stateCreatedAtTimestamp = 7;
string stateCreatedAtBlock = 8;
// Hex 0x
string stateReplacedBy = 11;
string GISTReplacedBy = 12;
// Dec
string GISTCreatedAtTimestamp = 13;
string GISTCreatedAtBlock = 14;
// HEx 0x
string replacedStateHash = 17;
string replacedGISTtHash = 18;
}
```

### CreateIdentityGISTTransferOperation

**CreateIdentityGISTTransferOperation** - creates Operation with type `IDENTITY_GIST_TRANSFER` and `INITIALIZED`
Expand Down
2 changes: 0 additions & 2 deletions x/oraclemanager/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
res, err = msgServer.Unjail(sdk.WrapSDKContext(ctx), msg)
case *types.MsgCreateTransferOp:
res, err = msgServer.CreateTransferOperation(sdk.WrapSDKContext(ctx), msg)
case *types.MsgCreateIdentityDefaultTransferOp:
res, err = msgServer.CreateIdentityDefaultTransferOperation(sdk.WrapSDKContext(ctx), msg)
case *types.MsgCreateIdentityGISTTransferOp:
res, err = msgServer.CreateIdentityGISTTransferOperation(sdk.WrapSDKContext(ctx), msg)
case *types.MsgCreateIdentityStateTransferOp:
Expand Down
8 changes: 0 additions & 8 deletions x/oraclemanager/keeper/abci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,6 @@ func getSourceChain(op rarimotypes.Operation) (string, error) {

return transfer.From.Chain, nil

case rarimotypes.OpType_IDENTITY_DEFAULT_TRANSFER:
transfer, err := pkg.GetIdentityDefaultTransfer(op)
if err != nil {
return "", err
}

return transfer.Chain, nil

case rarimotypes.OpType_IDENTITY_GIST_TRANSFER:
transfer, err := pkg.GetIdentityGISTTransfer(op)
if err != nil {
Expand Down
29 changes: 0 additions & 29 deletions x/oraclemanager/keeper/grpc_query_identity_default_transfer.go
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions x/oraclemanager/keeper/msg_server_identity_default_transfer.go
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions x/oraclemanager/types/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

func RegisterCodec(cdc *codec.LegacyAmino) {
cdc.RegisterConcrete(&MsgCreateTransferOp{}, "oraclemanager/CreateTransferOp", nil)
cdc.RegisterConcrete(&MsgCreateIdentityDefaultTransferOp{}, "oraclemanager/CreateIdentityDefaultTransferOp", nil)
cdc.RegisterConcrete(&MsgCreateIdentityGISTTransferOp{}, "oraclemanager/CreateIdentityGISTTransferOp", nil)
cdc.RegisterConcrete(&MsgCreateIdentityStateTransferOp{}, "oraclemanager/CreateIdentityStateTransferOp", nil)
cdc.RegisterConcrete(&MsgCreateWorldCoinIdentityTransferOp{}, "oraclemanager/CreateWorldCoinIdentityTransferOp", nil)
Expand All @@ -29,9 +28,6 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
registry.RegisterImplementations((*sdk.Msg)(nil),
&MsgCreateTransferOp{},
)
registry.RegisterImplementations((*sdk.Msg)(nil),
&MsgCreateIdentityDefaultTransferOp{},
)
registry.RegisterImplementations((*sdk.Msg)(nil),
&MsgCreateIdentityGISTTransferOp{},
)
Expand Down
3 changes: 0 additions & 3 deletions x/oraclemanager/types/expected_keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ type BankKeeper interface {
type RarimoKeeper interface {
IterateVotes(ctx sdk.Context, operation string, f func(vote rarimotypes.Vote) (stop bool))

GetIdentityDefaultTransfer(_ sdk.Context, msg *MsgCreateIdentityDefaultTransferOp) (*rarimotypes.IdentityDefaultTransfer, error)
CreateIdentityDefaultTransferOperation(ctx sdk.Context, creator string, transfer *rarimotypes.IdentityDefaultTransfer) error

GetIdentityGISTTransfer(_ sdk.Context, msg *MsgCreateIdentityGISTTransferOp) (*rarimotypes.IdentityGISTTransfer, error)
CreateIdentityGISTTransferOperation(ctx sdk.Context, creator string, transfer *rarimotypes.IdentityGISTTransfer) error

Expand Down
Loading