LaconicNetwork/cosmjs-util
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #409 from CosmWasm/408-protobuf-codec-wrapper

Browse Source 
Wrap protobuf codec in proto-signing
This commit is contained in:
Simon Warta 2020-08-19 18:31:47 +02:00 committed by GitHub
commit f3239d0156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 184 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/proto-signing/package.json
View File

@ -30,7 +30,7 @@
"move-types": "shx rm -rf ./types/* && shx mv build/types/* ./types && rm -rf ./types/testdata && shx rm -f ./types/*.spec.d.ts",
"format-types": "prettier --write --loglevel warn \"./types/**/*.d.ts\"",
"prebuild": "shx rm -rf ./build",
"build": "tsc && shx mkdir -p build/generated && shx cp ./src/generated/*.js ./build/generated && shx mkdir -p ./build/types/generated && shx cp ./src/generated/*.d.ts ./build/types/generated",
"build": "tsc && shx mkdir -p build/codec/generated && shx cp ./src/codec/generated/*.js ./build/codec/generated/ && shx mkdir -p ./build/types/codec/generated && shx cp ./src/codec/generated/*.d.ts ./build/types/codec/generated",
"postbuild": "yarn move-types && yarn format-types",
"build-or-skip": "[ -n \"$SKIP_BUILD\" ] || yarn build",
"test-node": "node jasmine-testrunner.js",
@ -43,9 +43,10 @@
"get-proto": "REF=20c80cfd44a068a592148d648c50de3459fd6295 ./scripts/get-proto.sh",
"predefine-proto": "./scripts/predefine-proto.sh",
"define-proto": "./scripts/define-proto.sh",
"postdefine-proto": "prettier --write \"src/generated/codecimpl.*\""
"postdefine-proto": "prettier --write \"src/codec/generated/codecimpl.*\""
},
"dependencies": {
"long": "^4.0.0",
"protobufjs": "~6.10.0"
},
"devDependencies": {

2
packages/proto-signing/scripts/define-proto.sh
View File

@ -5,7 +5,7 @@ command -v shellcheck > /dev/null && shellcheck "$0"
TMP_DIR="./tmp"
JS_SOURCE_FILE="$TMP_DIR/codecimpl.js"
DEFINITIONS_FILE="$TMP_DIR/codecimpl.d.ts"
OUTPUT_DIR="./src/generated/"
OUTPUT_DIR="./src/codec/generated/"
yarn pbts "$JS_SOURCE_FILE" -o "$DEFINITIONS_FILE"

1
packages/proto-signing/scripts/predefine-proto.sh
View File

@ -19,6 +19,7 @@ yarn pbjs \
--no-delimited \
--no-verify \
--no-convert \
--force-long \
"$COSMOS_PROTO_DIR/cosmos.proto" \
"$COSMOS_PROTO_DIR/bank/bank.proto" \
"$COSMOS_PROTO_DIR/crypto/crypto.proto" \

136
packages/proto-signing/src/generated/codecimpl.d.ts → packages/proto-signing/src/codec/generated/codecimpl.d.ts vendored
View File

@ -231,10 +231,10 @@ export namespace cosmos {
/** Properties of a GasInfo. */
interface IGasInfo {
/** GasInfo gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** GasInfo gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
}
/** Represents a GasInfo. */
@ -246,10 +246,10 @@ export namespace cosmos {
constructor(p?: cosmos.IGasInfo);
/** GasInfo gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** GasInfo gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/**
* Creates a new GasInfo instance using the specified properties.
@ -476,7 +476,7 @@ export namespace cosmos {
/** Properties of a TxResponse. */
interface ITxResponse {
/** TxResponse height */
height?: number | Long | null;
height?: Long | null;
/** TxResponse txhash */
txhash?: string | null;
@ -500,10 +500,10 @@ export namespace cosmos {
info?: string | null;
/** TxResponse gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** TxResponse gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** TxResponse tx */
tx?: google.protobuf.IAny | null;
@ -521,7 +521,7 @@ export namespace cosmos {
constructor(p?: cosmos.ITxResponse);
/** TxResponse height. */
public height: number | Long;
public height: Long;
/** TxResponse txhash. */
public txhash: string;
@ -545,10 +545,10 @@ export namespace cosmos {
public info: string;
/** TxResponse gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** TxResponse gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** TxResponse tx. */
public tx?: google.protobuf.IAny | null;
@ -1546,10 +1546,10 @@ export namespace cosmos {
chainId?: string | null;
/** SignDoc accountNumber */
accountNumber?: number | Long | null;
accountNumber?: Long | null;
/** SignDoc accountSequence */
accountSequence?: number | Long | null;
accountSequence?: Long | null;
}
/** Represents a SignDoc. */
@ -1570,10 +1570,10 @@ export namespace cosmos {
public chainId: string;
/** SignDoc accountNumber. */
public accountNumber: number | Long;
public accountNumber: Long;
/** SignDoc accountSequence. */
public accountSequence: number | Long;
public accountSequence: Long;
/**
* Creates a new SignDoc instance using the specified properties.
@ -1610,7 +1610,7 @@ export namespace cosmos {
memo?: string | null;
/** TxBody timeoutHeight */
timeoutHeight?: number | Long | null;
timeoutHeight?: Long | null;
/** TxBody extensionOptions */
extensionOptions?: google.protobuf.IAny[] | null;
@ -1634,7 +1634,7 @@ export namespace cosmos {
public memo: string;
/** TxBody timeoutHeight. */
public timeoutHeight: number | Long;
public timeoutHeight: Long;
/** TxBody extensionOptions. */
public extensionOptions: google.protobuf.IAny[];
@ -1918,7 +1918,7 @@ export namespace cosmos {
amount?: cosmos.ICoin[] | null;
/** Fee gasLimit */
gasLimit?: number | Long | null;
gasLimit?: Long | null;
}
/** Represents a Fee. */
@ -1933,7 +1933,7 @@ export namespace cosmos {
public amount: cosmos.ICoin[];
/** Fee gasLimit. */
public gasLimit: number | Long;
public gasLimit: Long;
/**
* Creates a new Fee instance using the specified properties.
@ -2476,10 +2476,10 @@ export namespace tendermint {
version?: string | null;
/** RequestInfo blockVersion */
blockVersion?: number | Long | null;
blockVersion?: Long | null;
/** RequestInfo p2pVersion */
p2pVersion?: number | Long | null;
p2pVersion?: Long | null;
}
/** Represents a RequestInfo. */
@ -2494,10 +2494,10 @@ export namespace tendermint {
public version: string;
/** RequestInfo blockVersion. */
public blockVersion: number | Long;
public blockVersion: Long;
/** RequestInfo p2pVersion. */
public p2pVersion: number | Long;
public p2pVersion: Long;
/**
* Creates a new RequestInfo instance using the specified properties.
@ -2668,7 +2668,7 @@ export namespace tendermint {
path?: string | null;
/** RequestQuery height */
height?: number | Long | null;
height?: Long | null;
/** RequestQuery prove */
prove?: boolean | null;
@ -2689,7 +2689,7 @@ export namespace tendermint {
public path: string;
/** RequestQuery height. */
public height: number | Long;
public height: Long;
/** RequestQuery prove. */
public prove: boolean;
@ -2911,7 +2911,7 @@ export namespace tendermint {
/** Properties of a RequestEndBlock. */
interface IRequestEndBlock {
/** RequestEndBlock height */
height?: number | Long | null;
height?: Long | null;
}
/** Represents a RequestEndBlock. */
@ -2923,7 +2923,7 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IRequestEndBlock);
/** RequestEndBlock height. */
public height: number | Long;
public height: Long;
/**
* Creates a new RequestEndBlock instance using the specified properties.
@ -3275,10 +3275,10 @@ export namespace tendermint {
version?: string | null;
/** ResponseInfo appVersion */
appVersion?: number | Long | null;
appVersion?: Long | null;
/** ResponseInfo lastBlockHeight */
lastBlockHeight?: number | Long | null;
lastBlockHeight?: Long | null;
/** ResponseInfo lastBlockAppHash */
lastBlockAppHash?: Uint8Array | null;
@ -3299,10 +3299,10 @@ export namespace tendermint {
public version: string;
/** ResponseInfo appVersion. */
public appVersion: number | Long;
public appVersion: Long;
/** ResponseInfo lastBlockHeight. */
public lastBlockHeight: number | Long;
public lastBlockHeight: Long;
/** ResponseInfo lastBlockAppHash. */
public lastBlockAppHash: Uint8Array;
@ -3470,7 +3470,7 @@ export namespace tendermint {
info?: string | null;
/** ResponseQuery index */
index?: number | Long | null;
index?: Long | null;
/** ResponseQuery key */
key?: Uint8Array | null;
@ -3482,7 +3482,7 @@ export namespace tendermint {
proof?: tendermint.crypto.merkle.IProof | null;
/** ResponseQuery height */
height?: number | Long | null;
height?: Long | null;
/** ResponseQuery codespace */
codespace?: string | null;
@ -3506,7 +3506,7 @@ export namespace tendermint {
public info: string;
/** ResponseQuery index. */
public index: number | Long;
public index: Long;
/** ResponseQuery key. */
public key: Uint8Array;
@ -3518,7 +3518,7 @@ export namespace tendermint {
public proof?: tendermint.crypto.merkle.IProof | null;
/** ResponseQuery height. */
public height: number | Long;
public height: Long;
/** ResponseQuery codespace. */
public codespace: string;
@ -3620,10 +3620,10 @@ export namespace tendermint {
info?: string | null;
/** ResponseCheckTx gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** ResponseCheckTx gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** ResponseCheckTx events */
events?: tendermint.abci.types.IEvent[] | null;
@ -3653,10 +3653,10 @@ export namespace tendermint {
public info: string;
/** ResponseCheckTx gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** ResponseCheckTx gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** ResponseCheckTx events. */
public events: tendermint.abci.types.IEvent[];
@ -3713,10 +3713,10 @@ export namespace tendermint {
info?: string | null;
/** ResponseDeliverTx gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** ResponseDeliverTx gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** ResponseDeliverTx events */
events?: tendermint.abci.types.IEvent[] | null;
@ -3746,10 +3746,10 @@ export namespace tendermint {
public info: string;
/** ResponseDeliverTx gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** ResponseDeliverTx gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** ResponseDeliverTx events. */
public events: tendermint.abci.types.IEvent[];
@ -3971,10 +3971,10 @@ export namespace tendermint {
/** Properties of a BlockParams. */
interface IBlockParams {
/** BlockParams maxBytes */
maxBytes?: number | Long | null;
maxBytes?: Long | null;
/** BlockParams maxGas */
maxGas?: number | Long | null;
maxGas?: Long | null;
}
/** Represents a BlockParams. */
@ -3986,10 +3986,10 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IBlockParams);
/** BlockParams maxBytes. */
public maxBytes: number | Long;
public maxBytes: Long;
/** BlockParams maxGas. */
public maxGas: number | Long;
public maxGas: Long;
/**
* Creates a new BlockParams instance using the specified properties.
@ -4022,7 +4022,7 @@ export namespace tendermint {
/** Properties of an EvidenceParams. */
interface IEvidenceParams {
/** EvidenceParams maxAgeNumBlocks */
maxAgeNumBlocks?: number | Long | null;
maxAgeNumBlocks?: Long | null;
/** EvidenceParams maxAgeDuration */
maxAgeDuration?: google.protobuf.IDuration | null;
@ -4037,7 +4037,7 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IEvidenceParams);
/** EvidenceParams maxAgeNumBlocks. */
public maxAgeNumBlocks: number | Long;
public maxAgeNumBlocks: Long;
/** EvidenceParams maxAgeDuration. */
public maxAgeDuration?: google.protobuf.IDuration | null;
@ -4242,7 +4242,7 @@ export namespace tendermint {
chainId?: string | null;
/** Header height */
height?: number | Long | null;
height?: Long | null;
/** Header time */
time?: google.protobuf.ITimestamp | null;
@ -4293,7 +4293,7 @@ export namespace tendermint {
public chainId: string;
/** Header height. */
public height: number | Long;
public height: Long;
/** Header time. */
public time?: google.protobuf.ITimestamp | null;
@ -4357,10 +4357,10 @@ export namespace tendermint {
/** Properties of a Version. */
interface IVersion {
/** Version Block */
Block?: number | Long | null;
Block?: Long | null;
/** Version App */
App?: number | Long | null;
App?: Long | null;
}
/** Represents a Version. */
@ -4372,10 +4372,10 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IVersion);
/** Version Block. */
public Block: number | Long;
public Block: Long;
/** Version App. */
public App: number | Long;
public App: Long;
/**
* Creates a new Version instance using the specified properties.
@ -4512,7 +4512,7 @@ export namespace tendermint {
address?: Uint8Array | null;
/** Validator power */
power?: number | Long | null;
power?: Long | null;
}
/** Represents a Validator. */
@ -4527,7 +4527,7 @@ export namespace tendermint {
public address: Uint8Array;
/** Validator power. */
public power: number | Long;
public power: Long;
/**
* Creates a new Validator instance using the specified properties.
@ -4561,7 +4561,7 @@ export namespace tendermint {
pubKey?: tendermint.abci.types.IPubKey | null;
/** ValidatorUpdate power */
power?: number | Long | null;
power?: Long | null;
}
/** Represents a ValidatorUpdate. */
@ -4576,7 +4576,7 @@ export namespace tendermint {
public pubKey?: tendermint.abci.types.IPubKey | null;
/** ValidatorUpdate power. */
public power: number | Long;
public power: Long;
/**
* Creates a new ValidatorUpdate instance using the specified properties.
@ -4719,13 +4719,13 @@ export namespace tendermint {
validator?: tendermint.abci.types.IValidator | null;
/** Evidence height */
height?: number | Long | null;
height?: Long | null;
/** Evidence time */
time?: google.protobuf.ITimestamp | null;
/** Evidence totalVotingPower */
totalVotingPower?: number | Long | null;
totalVotingPower?: Long | null;
}
/** Represents an Evidence. */
@ -4743,13 +4743,13 @@ export namespace tendermint {
public validator?: tendermint.abci.types.IValidator | null;
/** Evidence height. */
public height: number | Long;
public height: Long;
/** Evidence time. */
public time?: google.protobuf.ITimestamp | null;
/** Evidence totalVotingPower. */
public totalVotingPower: number | Long;
public totalVotingPower: Long;
/**
* Creates a new Evidence instance using the specified properties.
@ -5270,7 +5270,7 @@ export namespace tendermint {
key?: Uint8Array | null;
/** KI64Pair value */
value?: number | Long | null;
value?: Long | null;
}
/** Represents a KI64Pair. */
@ -5285,7 +5285,7 @@ export namespace tendermint {
public key: Uint8Array;
/** KI64Pair value. */
public value: number | Long;
public value: Long;
/**
* Creates a new KI64Pair instance using the specified properties.
@ -5372,7 +5372,7 @@ export namespace google {
/** Properties of a Timestamp. */
interface ITimestamp {
/** Timestamp seconds */
seconds?: number | Long | null;
seconds?: Long | null;
/** Timestamp nanos */
nanos?: number | null;
@ -5387,7 +5387,7 @@ export namespace google {
constructor(p?: google.protobuf.ITimestamp);
/** Timestamp seconds. */
public seconds: number | Long;
public seconds: Long;
/** Timestamp nanos. */
public nanos: number;
@ -5421,7 +5421,7 @@ export namespace google {
/** Properties of a Duration. */
interface IDuration {
/** Duration seconds */
seconds?: number | Long | null;
seconds?: Long | null;
/** Duration nanos */
nanos?: number | null;
@ -5436,7 +5436,7 @@ export namespace google {
constructor(p?: google.protobuf.IDuration);
/** Duration seconds. */
public seconds: number | Long;
public seconds: Long;
/** Duration nanos. */
public nanos: number;

0
packages/proto-signing/src/generated/codecimpl.js → packages/proto-signing/src/codec/generated/codecimpl.js
View File

9
packages/proto-signing/src/codec/index.ts Normal file
View File

@ -0,0 +1,9 @@
import Long from "long";
import protobuf from "protobufjs/minimal";
// Ensure the protobuf module has a Long implementation, which otherwise only works
// in Node.js (see https://github.com/protobufjs/protobuf.js/issues/921#issuecomment-334925145)
protobuf.util.Long = Long;
protobuf.configure();
export * from "./generated/codecimpl";

5
packages/proto-signing/src/decorator.spec.ts
View File

@ -1,9 +1,10 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { assert } from "@cosmjs/utils";
import Long from "long";
import { Message } from "protobufjs";
import { cosmos, google } from "./codec";
import { cosmosField, registered } from "./decorator";
import { cosmos, google } from "./generated/codecimpl";
import { Registry } from "./registry";
const { TxBody } = cosmos.tx;
@ -72,7 +73,7 @@ describe("decorator demo", () => {
const txBody = TxBody.create({
messages: [msgDemoWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();

11
packages/proto-signing/src/demo.spec.ts
View File

@ -1,11 +1,12 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { assert } from "@cosmjs/utils";
import Long from "long";
import protobuf from "protobufjs";
import { cosmos, google } from "./codec";
import reflectionRoot from "./demo";
import demoJson from "./demo.json";
import demoProto from "./demo.proto";
import { cosmos, google } from "./generated/codecimpl";
type MsgDemo = {
readonly example: string;
@ -40,7 +41,7 @@ describe("protobuf demo", () => {
const txBody = TxBody.create({
messages: [msgSendWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();
@ -72,7 +73,7 @@ describe("protobuf demo", () => {
const txBody = TxBody.create({
messages: [msgDemoWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();
@ -103,7 +104,7 @@ describe("protobuf demo", () => {
const txBody = TxBody.create({
messages: [msgDemoWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();
@ -133,7 +134,7 @@ describe("protobuf demo", () => {
const txBody = TxBody.create({
messages: [msgDemoWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();

15
packages/proto-signing/src/magic.spec.ts
View File

@ -1,4 +1,5 @@
/* eslint-disable @typescript-eslint/naming-convention */
import Long from "long";
import { Message } from "protobufjs";
import { cosmosField, registered } from "./decorator";
@ -28,10 +29,10 @@ describe("registry magic demo", () => {
public readonly bytesDemo?: Uint8Array;
@cosmosField.int64(4)
public readonly int64Demo?: number;
public readonly int64Demo?: Long;
@cosmosField.uint64(5)
public readonly uint64Demo?: number;
public readonly uint64Demo?: Long;
@cosmosField.repeatedString(6)
public readonly listDemo?: readonly string[];
@ -68,8 +69,8 @@ describe("registry magic demo", () => {
value: txBodyBytes,
});
expect(txBodyDecoded.memo).toEqual(txBodyFields.memo);
// int64Demo and uint64Demo decode to Long in Node
expect(Number(txBodyDecoded.timeoutHeight)).toEqual(txBodyFields.timeoutHeight);
// int64Demo and uint64Demo decode to Long
expect(txBodyDecoded.timeoutHeight).toEqual(Long.fromNumber(txBodyFields.timeoutHeight, true));
expect(txBodyDecoded.extensionOptions).toEqual(txBodyFields.extensionOptions);
const msgDemoDecoded = txBodyDecoded.messages[0] as MsgMagic;
@ -77,9 +78,9 @@ describe("registry magic demo", () => {
expect(msgDemoDecoded.booleanDemo).toEqual(msgDemoFields.booleanDemo);
expect(msgDemoDecoded.stringDemo).toEqual(msgDemoFields.stringDemo);
expect(msgDemoDecoded.bytesDemo).toEqual(msgDemoFields.bytesDemo);
// int64Demo and uint64Demo decode to Long in Node
expect(Number(msgDemoDecoded.int64Demo)).toEqual(msgDemoFields.int64Demo);
expect(Number(msgDemoDecoded.uint64Demo)).toEqual(msgDemoFields.uint64Demo);
// int64Demo and uint64Demo decode to Long
expect(msgDemoDecoded.int64Demo).toEqual(Long.fromNumber(msgDemoFields.int64Demo));
expect(msgDemoDecoded.uint64Demo).toEqual(Long.fromNumber(msgDemoFields.uint64Demo, true));
expect(msgDemoDecoded.listDemo).toEqual(msgDemoFields.listDemo);
expect(msgDemoDecoded.nestedDemo).toBeInstanceOf(MsgNestedMagic);

2
packages/proto-signing/src/msgs.spec.ts
View File

@ -1,7 +1,7 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { fromHex } from "@cosmjs/encoding";
import { cosmos } from "./generated/codecimpl";
import { cosmos } from "./codec";
import { Coin, MsgSend } from "./msgs";
describe("msgs", () => {

7
packages/proto-signing/src/registry.spec.ts
View File

@ -1,8 +1,9 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { assert } from "@cosmjs/utils";
import Long from "long";
import { cosmos, google } from "./codec";
import { MsgDemo as MsgDemoType } from "./demo";
import { cosmos, google } from "./generated/codecimpl";
import { Registry } from "./registry";
const { TxBody } = cosmos.tx;
@ -31,7 +32,7 @@ describe("registry demo", () => {
const txBody = TxBody.create({
messages: [msgSendWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();
@ -66,7 +67,7 @@ describe("registry demo", () => {
const txBody = TxBody.create({
messages: [msgDemoWrapped],
memo: "Some memo",
timeoutHeight: 9999,
timeoutHeight: Long.fromNumber(9999),
extensionOptions: [],
});
const txBodyBytes = TxBody.encode(txBody).finish();

5
packages/proto-signing/src/registry.ts
View File

@ -1,7 +1,8 @@
/* eslint-disable @typescript-eslint/naming-convention */
import Long from "long";
import protobuf from "protobufjs";
import { cosmos, google } from "./generated/codecimpl";
import { cosmos, google } from "./codec";
export interface GeneratedType {
readonly create: (properties?: { [k: string]: any }) => any;
@ -22,7 +23,7 @@ export interface DecodeObject {
export interface TxBodyValue {
readonly messages: readonly EncodeObject[];
readonly memo?: string;
readonly timeoutHeight?: number;
readonly timeoutHeight?: Long;
readonly extensionOptions?: google.protobuf.IAny[];
readonly nonCriticalExtensionOptions?: google.protobuf.IAny[];
}

5
packages/proto-signing/src/signing.spec.ts
View File

@ -1,8 +1,9 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { Bech32, fromBase64, fromHex, toHex } from "@cosmjs/encoding";
import { Secp256k1Wallet } from "@cosmjs/launchpad";
import Long from "long";
import { cosmos } from "./generated/codecimpl";
import { cosmos } from "./codec";
import { defaultRegistry } from "./msgs";
import { Registry, TxBodyValue } from "./registry";
import { makeSignBytes } from "./signing";
@ -66,7 +67,7 @@ describe("signing demo", () => {
const sendAmount = "1234567";
const sendDenom = "ucosm";
const gasLimit = 200000;
const gasLimit = Long.fromNumber(200000);
it("correctly parses test vectors", async () => {
const wallet = await Secp256k1Wallet.fromMnemonic(faucet.mnemonic);

2
packages/proto-signing/src/signing.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/naming-convention */
import { omitDefaults } from "./adr27";
import { cosmos } from "./generated/codecimpl";
import { cosmos } from "./codec";
const { SignDoc } = cosmos.tx;

136
packages/proto-signing/types/generated/codecimpl.d.ts → packages/proto-signing/types/codec/generated/codecimpl.d.ts vendored
View File

@ -231,10 +231,10 @@ export namespace cosmos {
/** Properties of a GasInfo. */
interface IGasInfo {
/** GasInfo gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** GasInfo gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
}
/** Represents a GasInfo. */
@ -246,10 +246,10 @@ export namespace cosmos {
constructor(p?: cosmos.IGasInfo);
/** GasInfo gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** GasInfo gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/**
* Creates a new GasInfo instance using the specified properties.
@ -476,7 +476,7 @@ export namespace cosmos {
/** Properties of a TxResponse. */
interface ITxResponse {
/** TxResponse height */
height?: number | Long | null;
height?: Long | null;
/** TxResponse txhash */
txhash?: string | null;
@ -500,10 +500,10 @@ export namespace cosmos {
info?: string | null;
/** TxResponse gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** TxResponse gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** TxResponse tx */
tx?: google.protobuf.IAny | null;
@ -521,7 +521,7 @@ export namespace cosmos {
constructor(p?: cosmos.ITxResponse);
/** TxResponse height. */
public height: number | Long;
public height: Long;
/** TxResponse txhash. */
public txhash: string;
@ -545,10 +545,10 @@ export namespace cosmos {
public info: string;
/** TxResponse gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** TxResponse gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** TxResponse tx. */
public tx?: google.protobuf.IAny | null;
@ -1546,10 +1546,10 @@ export namespace cosmos {
chainId?: string | null;
/** SignDoc accountNumber */
accountNumber?: number | Long | null;
accountNumber?: Long | null;
/** SignDoc accountSequence */
accountSequence?: number | Long | null;
accountSequence?: Long | null;
}
/** Represents a SignDoc. */
@ -1570,10 +1570,10 @@ export namespace cosmos {
public chainId: string;
/** SignDoc accountNumber. */
public accountNumber: number | Long;
public accountNumber: Long;
/** SignDoc accountSequence. */
public accountSequence: number | Long;
public accountSequence: Long;
/**
* Creates a new SignDoc instance using the specified properties.
@ -1610,7 +1610,7 @@ export namespace cosmos {
memo?: string | null;
/** TxBody timeoutHeight */
timeoutHeight?: number | Long | null;
timeoutHeight?: Long | null;
/** TxBody extensionOptions */
extensionOptions?: google.protobuf.IAny[] | null;
@ -1634,7 +1634,7 @@ export namespace cosmos {
public memo: string;
/** TxBody timeoutHeight. */
public timeoutHeight: number | Long;
public timeoutHeight: Long;
/** TxBody extensionOptions. */
public extensionOptions: google.protobuf.IAny[];
@ -1918,7 +1918,7 @@ export namespace cosmos {
amount?: cosmos.ICoin[] | null;
/** Fee gasLimit */
gasLimit?: number | Long | null;
gasLimit?: Long | null;
}
/** Represents a Fee. */
@ -1933,7 +1933,7 @@ export namespace cosmos {
public amount: cosmos.ICoin[];
/** Fee gasLimit. */
public gasLimit: number | Long;
public gasLimit: Long;
/**
* Creates a new Fee instance using the specified properties.
@ -2476,10 +2476,10 @@ export namespace tendermint {
version?: string | null;
/** RequestInfo blockVersion */
blockVersion?: number | Long | null;
blockVersion?: Long | null;
/** RequestInfo p2pVersion */
p2pVersion?: number | Long | null;
p2pVersion?: Long | null;
}
/** Represents a RequestInfo. */
@ -2494,10 +2494,10 @@ export namespace tendermint {
public version: string;
/** RequestInfo blockVersion. */
public blockVersion: number | Long;
public blockVersion: Long;
/** RequestInfo p2pVersion. */
public p2pVersion: number | Long;
public p2pVersion: Long;
/**
* Creates a new RequestInfo instance using the specified properties.
@ -2668,7 +2668,7 @@ export namespace tendermint {
path?: string | null;
/** RequestQuery height */
height?: number | Long | null;
height?: Long | null;
/** RequestQuery prove */
prove?: boolean | null;
@ -2689,7 +2689,7 @@ export namespace tendermint {
public path: string;
/** RequestQuery height. */
public height: number | Long;
public height: Long;
/** RequestQuery prove. */
public prove: boolean;
@ -2911,7 +2911,7 @@ export namespace tendermint {
/** Properties of a RequestEndBlock. */
interface IRequestEndBlock {
/** RequestEndBlock height */
height?: number | Long | null;
height?: Long | null;
}
/** Represents a RequestEndBlock. */
@ -2923,7 +2923,7 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IRequestEndBlock);
/** RequestEndBlock height. */
public height: number | Long;
public height: Long;
/**
* Creates a new RequestEndBlock instance using the specified properties.
@ -3275,10 +3275,10 @@ export namespace tendermint {
version?: string | null;
/** ResponseInfo appVersion */
appVersion?: number | Long | null;
appVersion?: Long | null;
/** ResponseInfo lastBlockHeight */
lastBlockHeight?: number | Long | null;
lastBlockHeight?: Long | null;
/** ResponseInfo lastBlockAppHash */
lastBlockAppHash?: Uint8Array | null;
@ -3299,10 +3299,10 @@ export namespace tendermint {
public version: string;
/** ResponseInfo appVersion. */
public appVersion: number | Long;
public appVersion: Long;
/** ResponseInfo lastBlockHeight. */
public lastBlockHeight: number | Long;
public lastBlockHeight: Long;
/** ResponseInfo lastBlockAppHash. */
public lastBlockAppHash: Uint8Array;
@ -3470,7 +3470,7 @@ export namespace tendermint {
info?: string | null;
/** ResponseQuery index */
index?: number | Long | null;
index?: Long | null;
/** ResponseQuery key */
key?: Uint8Array | null;
@ -3482,7 +3482,7 @@ export namespace tendermint {
proof?: tendermint.crypto.merkle.IProof | null;
/** ResponseQuery height */
height?: number | Long | null;
height?: Long | null;
/** ResponseQuery codespace */
codespace?: string | null;
@ -3506,7 +3506,7 @@ export namespace tendermint {
public info: string;
/** ResponseQuery index. */
public index: number | Long;
public index: Long;
/** ResponseQuery key. */
public key: Uint8Array;
@ -3518,7 +3518,7 @@ export namespace tendermint {
public proof?: tendermint.crypto.merkle.IProof | null;
/** ResponseQuery height. */
public height: number | Long;
public height: Long;
/** ResponseQuery codespace. */
public codespace: string;
@ -3620,10 +3620,10 @@ export namespace tendermint {
info?: string | null;
/** ResponseCheckTx gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** ResponseCheckTx gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** ResponseCheckTx events */
events?: tendermint.abci.types.IEvent[] | null;
@ -3653,10 +3653,10 @@ export namespace tendermint {
public info: string;
/** ResponseCheckTx gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** ResponseCheckTx gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** ResponseCheckTx events. */
public events: tendermint.abci.types.IEvent[];
@ -3713,10 +3713,10 @@ export namespace tendermint {
info?: string | null;
/** ResponseDeliverTx gasWanted */
gasWanted?: number | Long | null;
gasWanted?: Long | null;
/** ResponseDeliverTx gasUsed */
gasUsed?: number | Long | null;
gasUsed?: Long | null;
/** ResponseDeliverTx events */
events?: tendermint.abci.types.IEvent[] | null;
@ -3746,10 +3746,10 @@ export namespace tendermint {
public info: string;
/** ResponseDeliverTx gasWanted. */
public gasWanted: number | Long;
public gasWanted: Long;
/** ResponseDeliverTx gasUsed. */
public gasUsed: number | Long;
public gasUsed: Long;
/** ResponseDeliverTx events. */
public events: tendermint.abci.types.IEvent[];
@ -3971,10 +3971,10 @@ export namespace tendermint {
/** Properties of a BlockParams. */
interface IBlockParams {
/** BlockParams maxBytes */
maxBytes?: number | Long | null;
maxBytes?: Long | null;
/** BlockParams maxGas */
maxGas?: number | Long | null;
maxGas?: Long | null;
}
/** Represents a BlockParams. */
@ -3986,10 +3986,10 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IBlockParams);
/** BlockParams maxBytes. */
public maxBytes: number | Long;
public maxBytes: Long;
/** BlockParams maxGas. */
public maxGas: number | Long;
public maxGas: Long;
/**
* Creates a new BlockParams instance using the specified properties.
@ -4022,7 +4022,7 @@ export namespace tendermint {
/** Properties of an EvidenceParams. */
interface IEvidenceParams {
/** EvidenceParams maxAgeNumBlocks */
maxAgeNumBlocks?: number | Long | null;
maxAgeNumBlocks?: Long | null;
/** EvidenceParams maxAgeDuration */
maxAgeDuration?: google.protobuf.IDuration | null;
@ -4037,7 +4037,7 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IEvidenceParams);
/** EvidenceParams maxAgeNumBlocks. */
public maxAgeNumBlocks: number | Long;
public maxAgeNumBlocks: Long;
/** EvidenceParams maxAgeDuration. */
public maxAgeDuration?: google.protobuf.IDuration | null;
@ -4242,7 +4242,7 @@ export namespace tendermint {
chainId?: string | null;
/** Header height */
height?: number | Long | null;
height?: Long | null;
/** Header time */
time?: google.protobuf.ITimestamp | null;
@ -4293,7 +4293,7 @@ export namespace tendermint {
public chainId: string;
/** Header height. */
public height: number | Long;
public height: Long;
/** Header time. */
public time?: google.protobuf.ITimestamp | null;
@ -4357,10 +4357,10 @@ export namespace tendermint {
/** Properties of a Version. */
interface IVersion {
/** Version Block */
Block?: number | Long | null;
Block?: Long | null;
/** Version App */
App?: number | Long | null;
App?: Long | null;
}
/** Represents a Version. */
@ -4372,10 +4372,10 @@ export namespace tendermint {
constructor(p?: tendermint.abci.types.IVersion);
/** Version Block. */
public Block: number | Long;
public Block: Long;
/** Version App. */
public App: number | Long;
public App: Long;
/**
* Creates a new Version instance using the specified properties.
@ -4512,7 +4512,7 @@ export namespace tendermint {
address?: Uint8Array | null;
/** Validator power */
power?: number | Long | null;
power?: Long | null;
}
/** Represents a Validator. */
@ -4527,7 +4527,7 @@ export namespace tendermint {
public address: Uint8Array;
/** Validator power. */
public power: number | Long;
public power: Long;
/**
* Creates a new Validator instance using the specified properties.
@ -4561,7 +4561,7 @@ export namespace tendermint {
pubKey?: tendermint.abci.types.IPubKey | null;
/** ValidatorUpdate power */
power?: number | Long | null;
power?: Long | null;
}
/** Represents a ValidatorUpdate. */
@ -4576,7 +4576,7 @@ export namespace tendermint {
public pubKey?: tendermint.abci.types.IPubKey | null;
/** ValidatorUpdate power. */
public power: number | Long;
public power: Long;
/**
* Creates a new ValidatorUpdate instance using the specified properties.
@ -4719,13 +4719,13 @@ export namespace tendermint {
validator?: tendermint.abci.types.IValidator | null;
/** Evidence height */
height?: number | Long | null;
height?: Long | null;
/** Evidence time */
time?: google.protobuf.ITimestamp | null;
/** Evidence totalVotingPower */
totalVotingPower?: number | Long | null;
totalVotingPower?: Long | null;
}
/** Represents an Evidence. */
@ -4743,13 +4743,13 @@ export namespace tendermint {
public validator?: tendermint.abci.types.IValidator | null;
/** Evidence height. */
public height: number | Long;
public height: Long;
/** Evidence time. */
public time?: google.protobuf.ITimestamp | null;
/** Evidence totalVotingPower. */
public totalVotingPower: number | Long;
public totalVotingPower: Long;
/**
* Creates a new Evidence instance using the specified properties.
@ -5270,7 +5270,7 @@ export namespace tendermint {
key?: Uint8Array | null;
/** KI64Pair value */
value?: number | Long | null;
value?: Long | null;
}
/** Represents a KI64Pair. */
@ -5285,7 +5285,7 @@ export namespace tendermint {
public key: Uint8Array;
/** KI64Pair value. */
public value: number | Long;
public value: Long;
/**
* Creates a new KI64Pair instance using the specified properties.
@ -5372,7 +5372,7 @@ export namespace google {
/** Properties of a Timestamp. */
interface ITimestamp {
/** Timestamp seconds */
seconds?: number | Long | null;
seconds?: Long | null;
/** Timestamp nanos */
nanos?: number | null;
@ -5387,7 +5387,7 @@ export namespace google {
constructor(p?: google.protobuf.ITimestamp);
/** Timestamp seconds. */
public seconds: number | Long;
public seconds: Long;
/** Timestamp nanos. */
public nanos: number;
@ -5421,7 +5421,7 @@ export namespace google {
/** Properties of a Duration. */
interface IDuration {
/** Duration seconds */
seconds?: number | Long | null;
seconds?: Long | null;
/** Duration nanos */
nanos?: number | null;
@ -5436,7 +5436,7 @@ export namespace google {
constructor(p?: google.protobuf.IDuration);
/** Duration seconds. */
public seconds: number | Long;
public seconds: Long;
/** Duration nanos. */
public nanos: number;

1
packages/proto-signing/types/codec/index.d.ts vendored Normal file
View File

@ -0,0 +1 @@
export * from "./generated/codecimpl";

5
packages/proto-signing/types/registry.d.ts vendored
View File

@ -1,5 +1,6 @@
import Long from "long";
import protobuf from "protobufjs";
import { cosmos, google } from "./generated/codecimpl";
import { cosmos, google } from "./codec";
export interface GeneratedType {
readonly create: (properties?: { [k: string]: any }) => any;
readonly encode: (
@ -23,7 +24,7 @@ export interface DecodeObject {
export interface TxBodyValue {
readonly messages: readonly EncodeObject[];
readonly memo?: string;
readonly timeoutHeight?: number;
readonly timeoutHeight?: Long;
readonly extensionOptions?: google.protobuf.IAny[];
readonly nonCriticalExtensionOptions?: google.protobuf.IAny[];
}

1
packages/stargate/package.json
View File

@ -53,6 +53,7 @@
"@cosmjs/stream": "^0.22.2",
"@cosmjs/tendermint-rpc": "^0.22.2",
"@cosmjs/utils": "^0.22.2",
"long": "^4.0.0",
"protobufjs": "~6.10.0"
}
}