proto/cerc/auction/module/v1/module.proto

@@ -8,6 +8,6 @@ import "cosmos/app/v1alpha1/module.proto";
 // Learn more: https://docs.cosmos.network/main/building-modules/depinject
 message Module {
   option (cosmos.app.v1alpha1.module) = {
-    go_import : "git.vdb.to/cerc-io/laconic2d/x/auction"
+    go_import : "git.vdb.to/cerc-io/laconicd/x/auction"
   };
 }

proto/cerc/auction/v1/auction.proto

@@ -7,7 +7,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/auction";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/auction";
 
 // Params defines the auction module parameters
 message Params {

proto/cerc/auction/v1/genesis.proto

@@ -5,7 +5,7 @@ package cerc.auction.v1;
 import "gogoproto/gogo.proto";
 import "cerc/auction/v1/auction.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/auction";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/auction";
 
 // GenesisState defines the genesis state of the auction module
 message GenesisState {

proto/cerc/auction/v1/query.proto

@@ -8,7 +8,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "cerc/auction/v1/auction.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/auction";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/auction";
 
 // Query defines the gRPC querier interface for the auction module
 service Query {

proto/cerc/auction/v1/tx.proto

@@ -9,7 +9,7 @@ import "google/protobuf/duration.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "cerc/auction/v1/auction.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/auction";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/auction";
 
 // Tx defines the gRPC tx interface
 service Msg {

proto/cerc/bond/module/v1/module.proto

@@ -8,6 +8,6 @@ import "cosmos/app/v1alpha1/module.proto";
 // Learn more: https://docs.cosmos.network/main/building-modules/depinject
 message Module {
   option (cosmos.app.v1alpha1.module) = {
-    go_import : "git.vdb.to/cerc-io/laconic2d/x/bond"
+    go_import : "git.vdb.to/cerc-io/laconicd/x/bond"
   };
 }

proto/cerc/bond/v1/bond.proto

@@ -5,7 +5,7 @@ package cerc.bond.v1;
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/bond";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/bond";
 
 // Params defines the parameters of the bond module.
 message Params {

proto/cerc/bond/v1/genesis.proto

@@ -5,7 +5,7 @@ package cerc.bond.v1;
 import "gogoproto/gogo.proto";
 import "cerc/bond/v1/bond.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/bond";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/bond";
 
 // GenesisState defines the bond module's genesis state.
 message GenesisState {

proto/cerc/bond/v1/query.proto

@@ -9,7 +9,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "cerc/bond/v1/bond.proto";
 // import "cosmos/query/v1/query.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/bond";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/bond";
 
 // Query defines the gRPC querier service for bond module
 service Query {

proto/cerc/bond/v1/tx.proto

@@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/bond";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/bond";
 
 // Msg defines the bond Msg service.
 service Msg {

proto/cerc/registry/module/v1/module.proto

@@ -8,6 +8,6 @@ import "cosmos/app/v1alpha1/module.proto";
 // Learn more: https://docs.cosmos.network/main/building-modules/depinject
 message Module {
   option (cosmos.app.v1alpha1.module) = {
-    go_import : "git.vdb.to/cerc-io/laconic2d/x/registry"
+    go_import : "git.vdb.to/cerc-io/laconicd/x/registry"
   };
 }

proto/cerc/registry/v1/genesis.proto

@@ -5,7 +5,7 @@ package cerc.registry.v1;
 import "gogoproto/gogo.proto";
 import "cerc/registry/v1/registry.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/registry";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/registry";
 
 // GenesisState defines the registry module's genesis state.
 message GenesisState {

proto/cerc/registry/v1/query.proto

@@ -8,7 +8,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "cerc/registry/v1/registry.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/registry";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/registry";
 
 // Query defines the gRPC querier service for registry module
 service Query {

proto/cerc/registry/v1/registry.proto

@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "gogoproto/gogo.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/registry";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/registry";
 
 // Params defines the registry module parameters
 message Params {

proto/cerc/registry/v1/tx.proto

@@ -7,7 +7,7 @@ import "gogoproto/gogo.proto";
 import "cosmos/msg/v1/msg.proto";
 import "cerc/registry/v1/registry.proto";
 
-option go_package = "git.vdb.to/cerc-io/laconic2d/x/registry";
+option go_package = "git.vdb.to/cerc-io/laconicd/x/registry";
 
 // Msg is a service which exposes the registry functionality
 service Msg {

scripts/proto-gen.sh

@@ -5,7 +5,7 @@ set -e
 
 REPO_ROOT=$(pwd)
 I=$REPO_ROOT/proto
-DEST_TS=$REPO_ROOT/src/proto2/
+DEST_TS=$REPO_ROOT/src/proto/
 
 echo "Generating protobuf files"
 

src/index.ts

@@ -25,9 +25,9 @@ import {
   MessageMsgRevealBid
 } from './types/cerc/auction/message';
 import { LaconicClient } from './laconic-client';
-import { MsgCancelBondResponse, MsgCreateBondResponse, MsgRefillBondResponse, MsgWithdrawBondResponse } from './proto2/cerc/bond/v1/tx';
+import { MsgCancelBondResponse, MsgCreateBondResponse, MsgRefillBondResponse, MsgWithdrawBondResponse } from './proto/cerc/bond/v1/tx';
-import { Coin } from './proto2/cosmos/base/v1beta1/coin';
+import { Coin } from './proto/cosmos/base/v1beta1/coin';
-import { MsgSendResponse } from './proto2/cosmos/bank/v1beta1/tx';
+import { MsgSendResponse } from './proto/cosmos/bank/v1beta1/tx';
 import { MessageMsgSendCoins } from './types/cosmos/bank/message';
 
 export const DEFAULT_CHAIN_ID = 'laconic_9000-1';

src/laconic-client.ts

@@ -10,15 +10,15 @@ import {
 import { Comet38Client } from '@cosmjs/tendermint-rpc';
 
 import { MsgCancelBondEncodeObject, MsgCreateBondEncodeObject, MsgRefillBondEncodeObject, MsgWithdrawBondEncodeObject, bondTypes, typeUrlMsgCancelBond, typeUrlMsgCreateBond, typeUrlMsgRefillBond, typeUrlMsgWithdrawBond } from './types/cerc/bond/message';
-import { Coin } from './proto2/cosmos/base/v1beta1/coin';
+import { Coin } from './proto/cosmos/base/v1beta1/coin';
 import { MsgAssociateBondEncodeObject, MsgDeleteNameEncodeObject, MsgDissociateBondEncodeObject, MsgDissociateRecordsEncodeObject, MsgReassociateRecordsEncodeObject, MsgReserveAuthorityEncodeObject, MsgSetAuthorityBondEncodeObject, MsgSetNameEncodeObject, MsgSetRecordEncodeObject, registryTypes, typeUrlMsgAssociateBond, typeUrlMsgDeleteName, typeUrlMsgDissociateBond, typeUrlMsgDissociateRecords, typeUrlMsgReassociateRecords, typeUrlMsgReserveAuthority, typeUrlMsgSetAuthorityBond, typeUrlMsgSetName, typeUrlMsgSetRecord, NAMESERVICE_ERRORS } from './types/cerc/registry/message';
 import { MsgCommitBidEncodeObject, MsgRevealBidEncodeObject, auctionTypes, typeUrlMsgCommitBid, typeUrlMsgRevealBid } from './types/cerc/auction/message';
-import { MsgAssociateBondResponse, MsgDeleteNameResponse, MsgDissociateBondResponse, MsgDissociateRecordsResponse, MsgReassociateRecordsResponse, MsgReserveAuthorityResponse, MsgSetAuthorityBondResponse, MsgSetNameResponse, MsgSetRecordResponse, Payload } from './proto2/cerc/registry/v1/tx';
+import { MsgAssociateBondResponse, MsgDeleteNameResponse, MsgDissociateBondResponse, MsgDissociateRecordsResponse, MsgReassociateRecordsResponse, MsgReserveAuthorityResponse, MsgSetAuthorityBondResponse, MsgSetNameResponse, MsgSetRecordResponse, Payload } from './proto/cerc/registry/v1/tx';
-import { Record, Signature } from './proto2/cerc/registry/v1/registry';
+import { Record, Signature } from './proto/cerc/registry/v1/registry';
 import { Account } from './account';
 import { Util } from './util';
-import { MsgCommitBidResponse, MsgRevealBidResponse } from './proto2/cerc/auction/v1/tx';
+import { MsgCommitBidResponse, MsgRevealBidResponse } from './proto/cerc/auction/v1/tx';
-import { MsgCancelBondResponse, MsgCreateBondResponse, MsgRefillBondResponse, MsgWithdrawBondResponse } from './proto2/cerc/bond/v1/tx';
+import { MsgCancelBondResponse, MsgCreateBondResponse, MsgRefillBondResponse, MsgWithdrawBondResponse } from './proto/cerc/bond/v1/tx';
 import { bankTypes } from './types/cosmos/bank/message';
 
 const DEFAULT_WRITE_ERROR = 'Unable to write to laconic2d.';

src/types/cerc/auction/message.ts

@@ -1,6 +1,6 @@
 import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing';
 
-import { MsgCommitBidResponse, MsgCommitBid, MsgRevealBid, MsgRevealBidResponse } from '../../../proto2/cerc/auction/v1/tx';
+import { MsgCommitBidResponse, MsgCommitBid, MsgRevealBid, MsgRevealBidResponse } from '../../../proto/cerc/auction/v1/tx';
 
 export const typeUrlMsgCommitBid = '/cerc.auction.v1.MsgCommitBid';
 export const typeUrlMsgCommitBidResponse = '/cerc.auction.v1.MsgCommitBidResponse';

src/types/cerc/bond/message.ts

@@ -9,7 +9,7 @@ import {
   MsgRefillBondResponse,
   MsgWithdrawBondResponse,
   MsgCancelBondResponse
-} from '../../../proto2/cerc/bond/v1/tx';
+} from '../../../proto/cerc/bond/v1/tx';
 
 export const typeUrlMsgCreateBond = '/cerc.bond.v1.MsgCreateBond';
 export const typeUrlMsgRefillBond = '/cerc.bond.v1.MsgRefillBond';

src/types/cerc/registry/message.ts

@@ -1,6 +1,6 @@
 import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing';
 
-import { MsgReserveAuthority, MsgReserveAuthorityResponse, MsgSetAuthorityBond, MsgSetAuthorityBondResponse, MsgSetRecord, MsgSetRecordResponse, MsgSetName, MsgSetNameResponse, MsgDeleteName, MsgDeleteNameResponse, MsgAssociateBond, MsgAssociateBondResponse, MsgDissociateBond, MsgDissociateBondResponse, MsgDissociateRecords, MsgReassociateRecords, MsgDissociateRecordsResponse, MsgReassociateRecordsResponse } from '../../../proto2/cerc/registry/v1/tx';
+import { MsgReserveAuthority, MsgReserveAuthorityResponse, MsgSetAuthorityBond, MsgSetAuthorityBondResponse, MsgSetRecord, MsgSetRecordResponse, MsgSetName, MsgSetNameResponse, MsgDeleteName, MsgDeleteNameResponse, MsgAssociateBond, MsgAssociateBondResponse, MsgDissociateBond, MsgDissociateBondResponse, MsgDissociateRecords, MsgReassociateRecords, MsgDissociateRecordsResponse, MsgReassociateRecordsResponse } from '../../../proto/cerc/registry/v1/tx';
 
 export const typeUrlMsgReserveAuthority = '/cerc.registry.v1.MsgReserveAuthority';
 export const typeUrlMsgSetRecord = '/cerc.registry.v1.MsgSetRecord';

src/types/cosmos/bank/message.ts

@@ -2,7 +2,7 @@ import { GeneratedType } from '@cosmjs/proto-signing';
 
 import {
   MsgSendResponse
-} from '../../../proto2/cosmos/bank/v1beta1/tx';
+} from '../../../proto/cosmos/bank/v1beta1/tx';
 
 export const typeUrlMsgSendResponse = '/cosmos.bank.v1beta1.MsgSendResponse';