Skip to content

Commit

Permalink
Merge pull request #52 from osmosis-labs/v16
Browse files Browse the repository at this point in the history 
V16
  • Loading branch information
@pyramation
pyramation authored Jul 15, 2023
2 parents 66a17fc + 00403e5 commit 36ff70d
Show file tree
Hide file tree
Showing 204 changed files with 23,076 additions and 20,904 deletions.
2 changes: 1 addition & 1 deletion packages/osmojs/cosmos-sdk
Submodule cosmos-sdk updated 373 files
2 changes: 1 addition & 1 deletion packages/osmojs/osmosis
Submodule osmosis updated 233 files
3 changes: 2 additions & 1 deletion packages/osmojs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"e2e:start": "cd tests && make start",
"e2e:test": "jest --testPathPattern=starship/ --verbose --bail",
"e2e:debug": "jest --testPathPattern=starship/ --runInBand --verbose --bail",
"e2e:watch": "jest --watch --testPathPattern=starship/",
"e2e:stop": "cd tests && make stop",
"e2e:clean": "cd tests && make stop clean"
},
Expand Down Expand Up @@ -121,4 +122,4 @@
"long": "^5.2.0",
"protobufjs": "^6.11.3"
}
}
}
5 changes: 4 additions & 1 deletion packages/osmojs/scripts/codegen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ telescope({
duration: 'duration',
timestamp: 'date',
useExact: false,
useDeepPartial: false
useDeepPartial: false,
customTypes: {
useCosmosSDKDec: true
}
}
},
aminoEncoding: {
Expand Down
8 changes: 4 additions & 4 deletions packages/osmojs/src/codegen/capability/bundle.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as _53 from "./v1/capability";
import * as _54 from "./v1/genesis";
import * as _42 from "./v1/capability";
import * as _43 from "./v1/genesis";
export namespace capability {
export const v1 = { ..._53,
..._54
export const v1 = { ..._42,
..._43
};
}
144 changes: 72 additions & 72 deletions packages/osmojs/src/codegen/cosmos/bundle.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,42 +39,42 @@ import * as _37 from "./tx/v1beta1/service";
import * as _38 from "./tx/v1beta1/tx";
import * as _39 from "./upgrade/v1beta1/query";
import * as _40 from "./upgrade/v1beta1/upgrade";
import * as _188 from "./authz/v1beta1/tx.amino";
import * as _189 from "./bank/v1beta1/tx.amino";
import * as _190 from "./distribution/v1beta1/tx.amino";
import * as _191 from "./gov/v1beta1/tx.amino";
import * as _192 from "./staking/v1beta1/tx.amino";
import * as _193 from "./authz/v1beta1/tx.registry";
import * as _194 from "./bank/v1beta1/tx.registry";
import * as _195 from "./distribution/v1beta1/tx.registry";
import * as _196 from "./gov/v1beta1/tx.registry";
import * as _197 from "./staking/v1beta1/tx.registry";
import * as _198 from "./auth/v1beta1/query.lcd";
import * as _199 from "./authz/v1beta1/query.lcd";
import * as _200 from "./bank/v1beta1/query.lcd";
import * as _201 from "./base/node/v1beta1/query.lcd";
import * as _202 from "./distribution/v1beta1/query.lcd";
import * as _203 from "./gov/v1beta1/query.lcd";
import * as _204 from "./staking/v1beta1/query.lcd";
import * as _205 from "./tx/v1beta1/service.lcd";
import * as _206 from "./upgrade/v1beta1/query.lcd";
import * as _207 from "./auth/v1beta1/query.rpc.Query";
import * as _208 from "./authz/v1beta1/query.rpc.Query";
import * as _209 from "./bank/v1beta1/query.rpc.Query";
import * as _210 from "./base/node/v1beta1/query.rpc.Service";
import * as _211 from "./distribution/v1beta1/query.rpc.Query";
import * as _212 from "./gov/v1beta1/query.rpc.Query";
import * as _213 from "./staking/v1beta1/query.rpc.Query";
import * as _214 from "./tx/v1beta1/service.rpc.Service";
import * as _215 from "./upgrade/v1beta1/query.rpc.Query";
import * as _216 from "./authz/v1beta1/tx.rpc.msg";
import * as _217 from "./bank/v1beta1/tx.rpc.msg";
import * as _218 from "./distribution/v1beta1/tx.rpc.msg";
import * as _219 from "./gov/v1beta1/tx.rpc.msg";
import * as _220 from "./staking/v1beta1/tx.rpc.msg";
import * as _330 from "./lcd";
import * as _331 from "./rpc.query";
import * as _332 from "./rpc.tx";
import * as _190 from "./authz/v1beta1/tx.amino";
import * as _191 from "./bank/v1beta1/tx.amino";
import * as _192 from "./distribution/v1beta1/tx.amino";
import * as _193 from "./gov/v1beta1/tx.amino";
import * as _194 from "./staking/v1beta1/tx.amino";
import * as _195 from "./authz/v1beta1/tx.registry";
import * as _196 from "./bank/v1beta1/tx.registry";
import * as _197 from "./distribution/v1beta1/tx.registry";
import * as _198 from "./gov/v1beta1/tx.registry";
import * as _199 from "./staking/v1beta1/tx.registry";
import * as _200 from "./auth/v1beta1/query.lcd";
import * as _201 from "./authz/v1beta1/query.lcd";
import * as _202 from "./bank/v1beta1/query.lcd";
import * as _203 from "./base/node/v1beta1/query.lcd";
import * as _204 from "./distribution/v1beta1/query.lcd";
import * as _205 from "./gov/v1beta1/query.lcd";
import * as _206 from "./staking/v1beta1/query.lcd";
import * as _207 from "./tx/v1beta1/service.lcd";
import * as _208 from "./upgrade/v1beta1/query.lcd";
import * as _209 from "./auth/v1beta1/query.rpc.Query";
import * as _210 from "./authz/v1beta1/query.rpc.Query";
import * as _211 from "./bank/v1beta1/query.rpc.Query";
import * as _212 from "./base/node/v1beta1/query.rpc.Service";
import * as _213 from "./distribution/v1beta1/query.rpc.Query";
import * as _214 from "./gov/v1beta1/query.rpc.Query";
import * as _215 from "./staking/v1beta1/query.rpc.Query";
import * as _216 from "./tx/v1beta1/service.rpc.Service";
import * as _217 from "./upgrade/v1beta1/query.rpc.Query";
import * as _218 from "./authz/v1beta1/tx.rpc.msg";
import * as _219 from "./bank/v1beta1/tx.rpc.msg";
import * as _220 from "./distribution/v1beta1/tx.rpc.msg";
import * as _221 from "./gov/v1beta1/tx.rpc.msg";
import * as _222 from "./staking/v1beta1/tx.rpc.msg";
import * as _332 from "./lcd";
import * as _333 from "./rpc.query";
import * as _334 from "./rpc.tx";
export namespace cosmos {
export namespace ics23 {
export const v1 = { ..._0
Expand All @@ -84,8 +84,8 @@ export namespace cosmos {
export const v1beta1 = { ..._1,
..._2,
..._3,
..._198,
..._207
..._200,
..._209
};
}
export namespace authz {
Expand All @@ -94,11 +94,11 @@ export namespace cosmos {
..._6,
..._7,
..._8,
..._188,
..._193,
..._199,
..._208,
..._216
..._190,
..._195,
..._201,
..._210,
..._218
};
}
export namespace bank {
Expand All @@ -107,11 +107,11 @@ export namespace cosmos {
..._11,
..._12,
..._13,
..._189,
..._194,
..._200,
..._209,
..._217
..._191,
..._196,
..._202,
..._211,
..._219
};
}
export namespace base {
Expand All @@ -121,8 +121,8 @@ export namespace cosmos {
}
export namespace node {
export const v1beta1 = { ..._15,
..._201,
..._210
..._203,
..._212
};
}
export namespace query {
Expand Down Expand Up @@ -151,23 +151,23 @@ export namespace cosmos {
..._24,
..._25,
..._26,
..._190,
..._195,
..._202,
..._211,
..._218
..._192,
..._197,
..._204,
..._213,
..._220
};
}
export namespace gov {
export const v1beta1 = { ..._27,
..._28,
..._29,
..._30,
..._191,
..._196,
..._203,
..._212,
..._219
..._193,
..._198,
..._205,
..._214,
..._221
};
}
export namespace staking {
Expand All @@ -176,11 +176,11 @@ export namespace cosmos {
..._33,
..._34,
..._35,
..._192,
..._197,
..._204,
..._213,
..._220
..._194,
..._199,
..._206,
..._215,
..._222
};
}
export namespace tx {
Expand All @@ -190,19 +190,19 @@ export namespace cosmos {
}
export const v1beta1 = { ..._37,
..._38,
..._205,
..._214
..._207,
..._216
};
}
export namespace upgrade {
export const v1beta1 = { ..._39,
..._40,
..._206,
..._215
..._208,
..._217
};
}
export const ClientFactory = { ..._330,
..._331,
..._332
export const ClientFactory = { ..._332,
..._333,
..._334
};
}
21 changes: 11 additions & 10 deletions packages/osmojs/src/codegen/cosmos/distribution/v1beta1/distribution.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin";
import { Long } from "../../../helpers";
import * as _m0 from "protobufjs/minimal";
import { Decimal } from "@cosmjs/math";
/** Params defines the set of params for the distribution module. */

export interface Params {
Expand Down Expand Up @@ -475,15 +476,15 @@ export const Params = {

encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
if (message.communityTax !== "") {
writer.uint32(10).string(message.communityTax);
writer.uint32(10).string(Decimal.fromUserInput(message.communityTax, 18).atomics);
}

if (message.baseProposerReward !== "") {
writer.uint32(18).string(message.baseProposerReward);
writer.uint32(18).string(Decimal.fromUserInput(message.baseProposerReward, 18).atomics);
}

if (message.bonusProposerReward !== "") {
writer.uint32(26).string(message.bonusProposerReward);
writer.uint32(26).string(Decimal.fromUserInput(message.bonusProposerReward, 18).atomics);
}

if (message.withdrawAddrEnabled === true) {
Expand All @@ -503,15 +504,15 @@ export const Params = {

switch (tag >>> 3) {
case 1:
message.communityTax = reader.string();
message.communityTax = Decimal.fromAtomics(reader.string(), 18).toString();
break;

case 2:
message.baseProposerReward = reader.string();
message.baseProposerReward = Decimal.fromAtomics(reader.string(), 18).toString();
break;

case 3:
message.bonusProposerReward = reader.string();
message.bonusProposerReward = Decimal.fromAtomics(reader.string(), 18).toString();
break;

case 4:
Expand Down Expand Up @@ -986,7 +987,7 @@ export const ValidatorSlashEvent = {
}

if (message.fraction !== "") {
writer.uint32(18).string(message.fraction);
writer.uint32(18).string(Decimal.fromUserInput(message.fraction, 18).atomics);
}

return writer;
Expand All @@ -1006,7 +1007,7 @@ export const ValidatorSlashEvent = {
break;

case 2:
message.fraction = reader.string();
message.fraction = Decimal.fromAtomics(reader.string(), 18).toString();
break;

default:
Expand Down Expand Up @@ -1393,7 +1394,7 @@ export const DelegatorStartingInfo = {
}

if (message.stake !== "") {
writer.uint32(18).string(message.stake);
writer.uint32(18).string(Decimal.fromUserInput(message.stake, 18).atomics);
}

if (!message.height.isZero()) {
Expand All @@ -1417,7 +1418,7 @@ export const DelegatorStartingInfo = {
break;

case 2:
message.stake = reader.string();
message.stake = Decimal.fromAtomics(reader.string(), 18).toString();
break;

case 3:
Expand Down
Loading

0 comments on commit 36ff70d

Please sign in to comment.