carbon-js-sdk 0.11.21 → 0.11.22

package/lib/provider/metamask/MetaMask.js

@@ -41,6 +41,7 @@ const build_1 = require("@cosmjs/amino/build");
 const ethSignUtils = __importStar(require("eth-sig-util"));
 const util_1 = require("../../util");
 const wallet_1 = require("../../wallet");
+const proto_signing_1 = require("@cosmjs/proto-signing");
 const tx_1 = require("../../codec/cosmos/tx/v1beta1/tx");
 const legacyEIP712_1 = require("../../util/legacyEIP712");
 const index_1 = require("../../index");
@@ -152,10 +153,20 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
                 gas: (_d = (_c = authInfo.fee) === null || _c === void 0 ? void 0 : _c.gasLimit.toString()) !== null && _d !== void 0 ? _d : "0",
             };
             const aminoMsgs = msgs.map(msg => index_1.AminoTypesMap.toAmino(msg));
-            const sig = yield metamask.signEip712(evmHexAddress, doc.accountNumber.toString(), evmChainId, aminoMsgs, fee, txBody.memo, authInfo.signerInfos[0].sequence.toString());
+            const { sig, signedDoc } = yield metamask.signEip712(evmHexAddress, doc.accountNumber.toString(), evmChainId, aminoMsgs, fee, txBody.memo, authInfo.signerInfos[0].sequence.toString());
+            const signedTxBody = {
+                messages: msgs,
+                memo: signedDoc.memo,
+            };
+            const signedTxBodyEncodeObject = {
+                typeUrl: "/cosmos.tx.v1beta1.TxBody",
+                value: signedTxBody,
+            };
+            const signedTxBodyBytes = codec_1.registry.encode(signedTxBodyEncodeObject);
+            const signDoc = proto_signing_1.makeSignDoc(signedTxBodyBytes, doc.authInfoBytes, signedDoc.chain_id, parseInt(signedDoc.account_number));
             const sigBz = Uint8Array.from(Buffer.from(sig, 'hex'));
             return {
-                signed: doc,
+                signed: signDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -168,10 +179,10 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
         });
         const signAmino = (_, doc) => __awaiter(this, void 0, void 0, function* () {
             const { account_number, msgs, fee, memo, sequence } = doc;
-            const sig = yield metamask.signEip712(evmHexAddress, account_number, evmChainId, msgs, fee, memo, sequence);
+            const { sig, signedDoc } = yield metamask.signEip712(evmHexAddress, account_number, evmChainId, msgs, fee, memo, sequence);
             const sigBz = Uint8Array.from(Buffer.from(sig, 'hex'));
             return {
-                signed: doc,
+                signed: signedDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -198,9 +209,9 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
             // Only MsgMergeAccount will have an Eth address signer, other generic transaction will be cosmos address signer
             // FeePayer here is only used for legacy EIP-712
             const feePayer = index_1.AminoTypesMap.fromAmino(msgs[0]).typeUrl === codec_1.TxTypes.MsgMergeAccount ? util_1.AddressUtils.ETHAddress.publicKeyToBech32Address(Buffer.from(pubKeyBase64, "base64"), addressOptions) : signerAddress;
-            const sig = yield metamask.signEip712(evmHexAddress, account_number, chain_id, msgs, fee, memo, sequence, feePayer);
+            const { sig, signedDoc } = yield metamask.signEip712(evmHexAddress, account_number, chain_id, msgs, fee, memo, sequence, feePayer);
             return {
-                signed: doc,
+                signed: signedDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -554,11 +565,15 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
     }
     signEip712(evmHexAddress, accountNumber, evmChainId, msgs, fee, memo, sequence, feePayer = '') {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.verifyNetworkAndConnectedAccount(evmHexAddress, ethermint_1.parseChainId(evmChainId));
+            const metamaskNetwork = yield this.syncBlockchain();
+            const metamaskChainId = metamaskNetwork.chainId ? `carbon_${metamaskNetwork.chainId.toString()}-1` : '';
             const metamaskAPI = yield this.getConnectedAPI();
+            if (metamaskChainId !== evmChainId) {
+                memo += "|CROSSCHAIN-SIGNING|signed-chain-id:" + metamaskChainId + ";" + "carbon-chain-id:" + evmChainId;
+            }
             const stdSignDoc = build_1.makeSignDoc(msgs, fee, evmChainId, memo, accountNumber, sequence);
-            const eip712Tx = this.legacyEip712SignMode ? legacyEIP712_1.legacyConstructEIP712Tx(Object.assign(Object.assign({}, stdSignDoc), { fee: Object.assign(Object.assign({}, fee), { feePayer }) })) : eip712_1.constructEIP712Tx(stdSignDoc);
-            return yield provider_1.signTransactionWrapper(() => __awaiter(this, void 0, void 0, function* () {
+            const eip712Tx = this.legacyEip712SignMode ? legacyEIP712_1.legacyConstructEIP712Tx(Object.assign(Object.assign({}, stdSignDoc), { fee: Object.assign(Object.assign({}, fee), { feePayer }) })) : eip712_1.constructEIP712Tx(stdSignDoc, metamaskChainId);
+            const sig = yield provider_1.signTransactionWrapper(() => __awaiter(this, void 0, void 0, function* () {
                 const signature = (yield metamaskAPI.request({
                     method: 'eth_signTypedData_v4',
                     params: [
@@ -568,6 +583,7 @@ class MetaMask extends eip6963Provider_1.Eip6963Provider {
                 }));
                 return signature.split('0x')[1];
             }));
+            return { sig, signedDoc: stdSignDoc };
         });
     }
     sendEvmTransaction(req, metamaskAPI) {

package/lib/provider/rainbowKit/RainbowKitAccount.d.ts

@@ -1,4 +1,4 @@
-import { CarbonSDK, SupportedEip6963Provider } from "../../index";
+import { CarbonSDK, CarbonTx, SupportedEip6963Provider } from "../../index";
 import { CarbonSigner } from "../../wallet";
 import { ethers } from "ethers";
 import { StdFee } from "@cosmjs/stargate";
@@ -30,7 +30,10 @@ declare class RainbowKitAccount extends Eip6963Provider {
     verifyNetworkAndConnectedAccount(evmHexAddress: string, evmChainId: string): Promise<void>;
     verifyConnectedAccount(address: string): Promise<void>;
     verifyNetwork(evmChainId: string): Promise<void>;
-    signEip712(evmHexAddress: string, accountNumber: string, evmChainId: string, msgs: readonly AminoMsg[], fee: StdFee, memo: string, sequence: string, feePayer?: string): Promise<string>;
+    signEip712(evmHexAddress: string, accountNumber: string, evmChainId: string, msgs: readonly AminoMsg[], fee: StdFee, memo: string, sequence: string, feePayer?: string): Promise<{
+        sig: string;
+        signedDoc: CarbonTx.StdSignDoc;
+    }>;
     personalSign(address: string, message: string): Promise<string>;
     sendEvmTransaction(req: ethers.providers.TransactionRequest): Promise<string>;
 }

package/lib/provider/rainbowKit/RainbowKitAccount.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const index_1 = require("../../index");
 const ethermint_1 = require("../../util/ethermint");
 const wallet_1 = require("../../wallet");
+const proto_signing_1 = require("@cosmjs/proto-signing");
 const ethers_1 = require("ethers");
 const error_1 = require("../metamask/error");
 const tx_1 = require("cosmjs-types/cosmos/tx/v1beta1/tx");
@@ -51,10 +52,20 @@ class RainbowKitAccount extends eip6963Provider_1.Eip6963Provider {
                 gas: (_d = (_c = authInfo.fee) === null || _c === void 0 ? void 0 : _c.gasLimit.toString()) !== null && _d !== void 0 ? _d : "0",
             };
             const aminoMsgs = msgs.map(msg => index_1.AminoTypesMap.toAmino(msg));
-            const sig = yield rainbowKit.signEip712(evmHexAddress, doc.accountNumber.toString(), evmChainId, aminoMsgs, fee, txBody.memo, authInfo.signerInfos[0].sequence.toString());
+            const { sig, signedDoc } = yield rainbowKit.signEip712(evmHexAddress, doc.accountNumber.toString(), evmChainId, aminoMsgs, fee, txBody.memo, authInfo.signerInfos[0].sequence.toString());
+            const signedTxBody = {
+                messages: msgs,
+                memo: signedDoc.memo,
+            };
+            const signedTxBodyEncodeObject = {
+                typeUrl: "/cosmos.tx.v1beta1.TxBody",
+                value: signedTxBody,
+            };
+            const signedTxBodyBytes = codec_1.registry.encode(signedTxBodyEncodeObject);
+            const signDoc = proto_signing_1.makeSignDoc(signedTxBodyBytes, doc.authInfoBytes, signedDoc.chain_id, parseInt(signedDoc.account_number));
             const sigBz = Uint8Array.from(Buffer.from(sig, 'hex'));
             return {
-                signed: doc,
+                signed: signDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -67,10 +78,10 @@ class RainbowKitAccount extends eip6963Provider_1.Eip6963Provider {
         });
         const signAmino = (_, doc) => __awaiter(this, void 0, void 0, function* () {
             const { account_number, msgs, fee, memo, sequence } = doc;
-            const sig = yield rainbowKit.signEip712(evmHexAddress, account_number, evmChainId, msgs, fee, memo, sequence);
+            const { sig, signedDoc } = yield rainbowKit.signEip712(evmHexAddress, account_number, evmChainId, msgs, fee, memo, sequence);
             const sigBz = Uint8Array.from(Buffer.from(sig, 'hex'));
             return {
-                signed: doc,
+                signed: signedDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -86,9 +97,9 @@ class RainbowKitAccount extends eip6963Provider_1.Eip6963Provider {
             // Only MsgMergeAccount will have an Eth address signer, other generic transaction will be cosmos address signer
             // FeePayer here is only used for legacy EIP-712
             const feePayer = index_1.AminoTypesMap.fromAmino(msgs[0]).typeUrl === codec_1.TxTypes.MsgMergeAccount ? index_1.AddressUtils.ETHAddress.publicKeyToBech32Address(Buffer.from(pubKeyBase64, "base64"), addressOptions) : signerAddress;
-            const sig = yield rainbowKit.signEip712(evmHexAddress, account_number, chain_id, msgs, fee, memo, sequence, feePayer);
+            const { sig, signedDoc } = yield rainbowKit.signEip712(evmHexAddress, account_number, chain_id, msgs, fee, memo, sequence, feePayer);
             return {
-                signed: doc,
+                signed: signedDoc,
                 signature: {
                     pub_key: {
                         type: ethermint_1.ETH_SECP256K1_TYPE,
@@ -290,20 +301,25 @@ class RainbowKitAccount extends eip6963Provider_1.Eip6963Provider {
     }
     signEip712(evmHexAddress, accountNumber, evmChainId, msgs, fee, memo, sequence, feePayer = '') {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.verifyNetworkAndConnectedAccount(evmHexAddress, ethermint_1.parseChainId(evmChainId));
+            const { chainId } = yield this.syncBlockchain();
+            const walletChainId = chainId ? `carbon_${chainId.toString()}-1` : '';
+            const api = this.getApi();
+            if (walletChainId !== evmChainId) {
+                memo += "|CROSSCHAIN-SIGNING|signed-chain-id:" + walletChainId + ";" + "carbon-chain-id:" + evmChainId;
+            }
             const stdSignDoc = amino_1.makeSignDoc(msgs, fee, evmChainId, memo, accountNumber, sequence);
-            const eip712Tx = this.legacyEip712SignMode ? legacyEIP712_1.legacyConstructEIP712Tx(Object.assign(Object.assign({}, stdSignDoc), { fee: Object.assign(Object.assign({}, fee), { feePayer }) })) : eip712_1.constructEIP712Tx(stdSignDoc);
-            const ethereum = this.getApi();
-            return yield provider_1.signTransactionWrapper(() => __awaiter(this, void 0, void 0, function* () {
-                const signature = yield ethereum.request({
+            const eip712Tx = this.legacyEip712SignMode ? legacyEIP712_1.legacyConstructEIP712Tx(Object.assign(Object.assign({}, stdSignDoc), { fee: Object.assign(Object.assign({}, fee), { feePayer }) })) : eip712_1.constructEIP712Tx(stdSignDoc, walletChainId);
+            const sig = yield provider_1.signTransactionWrapper(() => __awaiter(this, void 0, void 0, function* () {
+                const signature = (yield api.request({
                     method: 'eth_signTypedData_v4',
                     params: [
                         evmHexAddress,
                         JSON.stringify(eip712Tx),
                     ],
-                });
+                }));
                 return signature.split('0x')[1];
             }));
+            return { sig, signedDoc: stdSignDoc };
         });
     }
     personalSign(address, message) {

package/lib/util/eip712.d.ts

@@ -7,4 +7,4 @@ export interface EIP712Tx {
     readonly domain: TypedDataDomain;
     readonly message: any;
 }
-export declare function constructEIP712Tx(doc: CarbonTx.StdSignDoc): EIP712Tx;
+export declare function constructEIP712Tx(doc: CarbonTx.StdSignDoc, chainId?: string): EIP712Tx;

package/lib/util/eip712.js

@@ -178,12 +178,12 @@ function isNonZeroField(fieldValue) {
     }
     return fieldValue;
 }
-function constructEIP712Tx(doc) {
+function constructEIP712Tx(doc, chainId) {
     const { account_number, chain_id, fee, memo, sequence } = doc;
     const eip712Tx = {
         types: getTypes(doc.msgs),
         primaryType: "Tx",
-        domain: Object.assign(Object.assign({}, eip712_1.DEFAULT_CARBON_DOMAIN_FIELDS), { chainId: ethermint_1.parseChainId(doc.chain_id) }),
+        domain: Object.assign(Object.assign({}, eip712_1.DEFAULT_CARBON_DOMAIN_FIELDS), { chainId: ethermint_1.parseChainId(chainId || chain_id) }),
         message: Object.assign({ account_number, chain_id, fee, memo, sequence }, convertMsgs(doc.msgs)),
     };
     return eip712Tx;

package/lib/util/tx.d.ts

@@ -263,6 +263,16 @@ export declare const Types: {
     MsgDeployOracleContractResponse: string;
     MsgCreateResult: string;
     MsgCreateResultResponse: string;
+    MsgCreateRfq: string;
+    MsgCreateRfqResponse: string;
+    MsgCancelRfq: string;
+    MsgCancelRfqResponse: string;
+    MsgCreateQuote: string;
+    MsgCreateQuoteResponse: string;
+    MsgAcceptQuote: string;
+    MsgAcceptQuoteResponse: string;
+    MsgOtcUpdateParams: string;
+    MsgOtcUpdateParamsResponse: string;
     MsgDeactivateContract: string;
     MsgDeactivateContractResponse: string;
     MsgActivateContract: string;
@@ -292,8 +302,6 @@ export declare const Types: {
     MsgLinkTokenResponse: string;
     MsgWithdraw: string;
     MsgWithdrawResponse: string;
-    MsgAdminWithdraw: string;
-    MsgAdminWithdrawResponse: string;
     MsgAuthorizeBridge: string;
     MsgAuthorizeBridgeResponse: string;
     MsgDeauthorizeBridge: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.11.21",
+  "version": "0.11.22",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",