diff --git a/packages/proto-signing/src/codec/cosmos/tx/signing/v1beta1/signing.ts b/packages/proto-signing/src/codec/cosmos/tx/signing/v1beta1/signing.ts index 48f3d120..f39a6141 100644 --- a/packages/proto-signing/src/codec/cosmos/tx/signing/v1beta1/signing.ts +++ b/packages/proto-signing/src/codec/cosmos/tx/signing/v1beta1/signing.ts @@ -219,7 +219,7 @@ export const SignatureDescriptor = { fromJSON(object: any): SignatureDescriptor { const message = { ...baseSignatureDescriptor } as SignatureDescriptor; if (object.publicKey !== undefined && object.publicKey !== null) { - message.publicKey = Any.fromJSON(object.publicKey); + message.publicKey = Any.fromPartial(object.publicKey); } else { message.publicKey = undefined; } diff --git a/packages/proto-signing/src/demo.spec.ts b/packages/proto-signing/src/demo.spec.ts index 3d3e504a..3d0fcf40 100644 --- a/packages/proto-signing/src/demo.spec.ts +++ b/packages/proto-signing/src/demo.spec.ts @@ -32,7 +32,7 @@ describe("protobuf demo", () => { amount: [coin], }); const msgSendBytes = MsgSend.encode(msgSend).finish(); - const msgSendWrapped = Any.fromJSON({ + const msgSendWrapped = Any.fromPartial({ typeUrl: "/cosmos.bank.v1beta1.MsgSend", value: msgSendBytes, }); @@ -64,7 +64,7 @@ describe("protobuf demo", () => { example: "Some example text", }) as unknown) as MsgDemo; const msgDemoBytes = encoder.encode(msgDemo).finish(); - const msgDemoWrapped = Any.fromJSON({ + const msgDemoWrapped = Any.fromPartial({ typeUrl: typeUrl, value: msgDemoBytes, }); @@ -95,7 +95,7 @@ describe("protobuf demo", () => { example: "Some example text", }) as unknown) as MsgDemo; const msgDemoBytes = encoder.encode(msgDemo).finish(); - const msgDemoWrapped = Any.fromJSON({ + const msgDemoWrapped = Any.fromPartial({ typeUrl: typeUrl, value: msgDemoBytes, }); @@ -125,7 +125,7 @@ describe("protobuf demo", () => { example: "Some example text", }) as unknown) as MsgDemo; const msgDemoBytes = encoder.encode(msgDemo).finish(); - const msgDemoWrapped = Any.fromJSON({ + const msgDemoWrapped = Any.fromPartial({ typeUrl: typeUrl, value: msgDemoBytes, }); diff --git a/packages/proto-signing/src/pubkey.spec.ts b/packages/proto-signing/src/pubkey.spec.ts index bcaeb56b..1f5fa27e 100644 --- a/packages/proto-signing/src/pubkey.spec.ts +++ b/packages/proto-signing/src/pubkey.spec.ts @@ -13,7 +13,7 @@ describe("pubkey", () => { it("works for secp256k1", () => { const pubkey = { type: "tendermint/PubKeySecp256k1", value: defaultPubkeyBase64 }; expect(encodePubkey(pubkey)).toEqual( - Any.fromJSON({ + Any.fromPartial({ typeUrl: "/cosmos.crypto.secp256k1.PubKey", value: defaultPubkeyProtoBytes, }), diff --git a/packages/proto-signing/src/pubkey.ts b/packages/proto-signing/src/pubkey.ts index 19b42f97..08bb9b2f 100644 --- a/packages/proto-signing/src/pubkey.ts +++ b/packages/proto-signing/src/pubkey.ts @@ -8,10 +8,10 @@ import { Any } from "./codec/google/protobuf/any"; export function encodePubkey(pubkey: LaunchpadPubKey): Any { switch (pubkey.type) { case "tendermint/PubKeySecp256k1": { - const pubkeyProto = PubKey.fromJSON({ + const pubkeyProto = PubKey.fromPartial({ key: fromBase64(pubkey.value), }); - return Any.fromJSON({ + return Any.fromPartial({ typeUrl: "/cosmos.crypto.secp256k1.PubKey", value: Uint8Array.from(PubKey.encode(pubkeyProto).finish()), }); diff --git a/packages/proto-signing/src/registry.spec.ts b/packages/proto-signing/src/registry.spec.ts index 4d1a86aa..4af159ed 100644 --- a/packages/proto-signing/src/registry.spec.ts +++ b/packages/proto-signing/src/registry.spec.ts @@ -13,17 +13,17 @@ describe("registry demo", () => { const Coin = registry.lookupType("/cosmos.base.v1beta1.Coin")!; const MsgSend = registry.lookupType("/cosmos.bank.v1beta1.MsgSend")!; - const coin = Coin.fromJSON({ + const coin = Coin.fromPartial({ denom: "ucosm", amount: "1234567890", }); - const msgSend = (MsgSend.fromJSON({ + const msgSend = (MsgSend.fromPartial({ fromAddress: "cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6", toAddress: "cosmos1qypqxpq9qcrsszg2pvxq6rs0zqg3yyc5lzv7xu", amount: [coin], }) as unknown) as IMsgSend; const msgSendBytes = MsgSend.encode(msgSend).finish(); - const msgSendWrapped = Any.fromJSON({ + const msgSendWrapped = Any.fromPartial({ typeUrl: "/cosmos.bank.v1beta1.MsgSend", value: msgSendBytes, }); @@ -55,7 +55,7 @@ describe("registry demo", () => { // const registry = new Registry([[typeUrl, MsgDemoType]]); // const MsgDemo = registry.lookupType(typeUrl)!; - // const msgDemo = MsgDemo.fromJSON({ + // const msgDemo = MsgDemo.fromPartial({ // example: "Some example text", // }); // const msgDemoBytes = MsgDemo.encode(msgDemo).finish(); diff --git a/packages/proto-signing/src/registry.ts b/packages/proto-signing/src/registry.ts index 461901ff..63319964 100644 --- a/packages/proto-signing/src/registry.ts +++ b/packages/proto-signing/src/registry.ts @@ -80,7 +80,7 @@ export class Registry { public encodeTxBody(txBodyFields: TxBodyValue): Uint8Array { const wrappedMessages = txBodyFields.messages.map((message) => { const messageBytes = this.encode(message); - return Any.fromJSON({ + return Any.fromPartial({ typeUrl: message.typeUrl, value: messageBytes, }); diff --git a/packages/proto-signing/src/signing.spec.ts b/packages/proto-signing/src/signing.spec.ts index 8df96f1b..3a49b9f6 100644 --- a/packages/proto-signing/src/signing.spec.ts +++ b/packages/proto-signing/src/signing.spec.ts @@ -62,7 +62,7 @@ describe("signing", () => { const myRegistry = new Registry(); const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic); const [{ address, pubkey: pubkeyBytes }] = await wallet.getAccounts(); - const publicKey = PubKey.fromJSON({ + const publicKey = PubKey.fromPartial({ key: pubkeyBytes, }); const publicKeyBytes = PubKey.encode(publicKey).finish(); @@ -89,7 +89,10 @@ describe("signing", () => { value: txBodyFields, }); - const publicKeyAny = Any.fromJSON({ typeUrl: "/cosmos.crypto.secp256k1.PubKey", value: publicKeyBytes }); + const publicKeyAny = Any.fromPartial({ + typeUrl: "/cosmos.crypto.secp256k1.PubKey", + value: publicKeyBytes, + }); const accountNumber = 1; await Promise.all(