carbon-js-sdk 0.7.13 → 0.7.16

package/lib/codec/Switcheo/carbon/book/query.js

@@ -10,11 +10,11 @@ const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const book_1 = require("./book");
 const pagination_1 = require("../../../cosmos/base/query/v1beta1/pagination");
 exports.protobufPackage = "Switcheo.carbon.book";
-const baseQueryImpactPriceRequest = { market: "", quoteAmount: "" };
+const baseQueryImpactPriceRequest = { marketId: "", quoteAmount: "" };
 exports.QueryImpactPriceRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.market !== "") {
-            writer.uint32(10).string(message.market);
+        if (message.marketId !== "") {
+            writer.uint32(10).string(message.marketId);
         }
         if (message.quoteAmount !== "") {
             writer.uint32(18).string(message.quoteAmount);
@@ -29,7 +29,7 @@ exports.QueryImpactPriceRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.market = reader.string();
+                    message.marketId = reader.string();
                     break;
                 case 2:
                     message.quoteAmount = reader.string();
@@ -43,9 +43,9 @@ exports.QueryImpactPriceRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryImpactPriceRequest);
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
         message.quoteAmount =
             object.quoteAmount !== undefined && object.quoteAmount !== null
@@ -55,7 +55,7 @@ exports.QueryImpactPriceRequest = {
     },
     toJSON(message) {
         const obj = {};
-        message.market !== undefined && (obj.market = message.market);
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         message.quoteAmount !== undefined &&
             (obj.quoteAmount = message.quoteAmount);
         return obj;
@@ -63,7 +63,7 @@ exports.QueryImpactPriceRequest = {
     fromPartial(object) {
         var _a, _b;
         const message = Object.assign({}, baseQueryImpactPriceRequest);
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
         message.quoteAmount = (_b = object.quoteAmount) !== null && _b !== void 0 ? _b : "";
         return message;
     },
@@ -143,11 +143,11 @@ exports.QueryImpactPriceResponse = {
         return message;
     },
 };
-const baseQueryGetBookRequest = { market: "" };
+const baseQueryGetBookRequest = { marketId: "" };
 exports.QueryGetBookRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.market !== "") {
-            writer.uint32(10).string(message.market);
+        if (message.marketId !== "") {
+            writer.uint32(10).string(message.marketId);
         }
         return writer;
     },
@@ -159,7 +159,7 @@ exports.QueryGetBookRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.market = reader.string();
+                    message.marketId = reader.string();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -170,21 +170,21 @@ exports.QueryGetBookRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryGetBookRequest);
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.market !== undefined && (obj.market = message.market);
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         return obj;
     },
     fromPartial(object) {
         var _a;
         const message = Object.assign({}, baseQueryGetBookRequest);
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
@@ -353,11 +353,11 @@ exports.QueryAllBookResponse = {
         return message;
     },
 };
-const baseQueryGetStopBookRequest = { market: "" };
+const baseQueryGetStopBookRequest = { marketId: "" };
 exports.QueryGetStopBookRequest = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.market !== "") {
-            writer.uint32(10).string(message.market);
+        if (message.marketId !== "") {
+            writer.uint32(10).string(message.marketId);
         }
         return writer;
     },
@@ -369,7 +369,7 @@ exports.QueryGetStopBookRequest = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.market = reader.string();
+                    message.marketId = reader.string();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -380,21 +380,21 @@ exports.QueryGetStopBookRequest = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseQueryGetStopBookRequest);
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
         return message;
     },
     toJSON(message) {
         const obj = {};
-        message.market !== undefined && (obj.market = message.market);
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         return obj;
     },
     fromPartial(object) {
         var _a;
         const message = Object.assign({}, baseQueryGetStopBookRequest);
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
         return message;
     },
 };
@@ -568,9 +568,11 @@ class QueryClientImpl {
     constructor(rpc) {
         this.rpc = rpc;
         this.ImpactPrice = this.ImpactPrice.bind(this);
-        this.Book = this.Book.bind(this);
+        this.CombinedBook = this.CombinedBook.bind(this);
+        this.ConcreteBook = this.ConcreteBook.bind(this);
+        this.VirtualBook = this.VirtualBook.bind(this);
         this.StopBook = this.StopBook.bind(this);
-        this.BookAll = this.BookAll.bind(this);
+        this.CombinedBookAll = this.CombinedBookAll.bind(this);
         this.StopBookAll = this.StopBookAll.bind(this);
     }
     ImpactPrice(request) {
@@ -578,9 +580,19 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.book.Query", "ImpactPrice", data);
         return promise.then((data) => exports.QueryImpactPriceResponse.decode(new minimal_1.default.Reader(data)));
     }
-    Book(request) {
+    CombinedBook(request) {
         const data = exports.QueryGetBookRequest.encode(request).finish();
-        const promise = this.rpc.request("Switcheo.carbon.book.Query", "Book", data);
+        const promise = this.rpc.request("Switcheo.carbon.book.Query", "CombinedBook", data);
+        return promise.then((data) => exports.QueryGetBookResponse.decode(new minimal_1.default.Reader(data)));
+    }
+    ConcreteBook(request) {
+        const data = exports.QueryGetBookRequest.encode(request).finish();
+        const promise = this.rpc.request("Switcheo.carbon.book.Query", "ConcreteBook", data);
+        return promise.then((data) => exports.QueryGetBookResponse.decode(new minimal_1.default.Reader(data)));
+    }
+    VirtualBook(request) {
+        const data = exports.QueryGetBookRequest.encode(request).finish();
+        const promise = this.rpc.request("Switcheo.carbon.book.Query", "VirtualBook", data);
         return promise.then((data) => exports.QueryGetBookResponse.decode(new minimal_1.default.Reader(data)));
     }
     StopBook(request) {
@@ -588,9 +600,9 @@ class QueryClientImpl {
         const promise = this.rpc.request("Switcheo.carbon.book.Query", "StopBook", data);
         return promise.then((data) => exports.QueryGetStopBookResponse.decode(new minimal_1.default.Reader(data)));
     }
-    BookAll(request) {
+    CombinedBookAll(request) {
         const data = exports.QueryAllBookRequest.encode(request).finish();
-        const promise = this.rpc.request("Switcheo.carbon.book.Query", "BookAll", data);
+        const promise = this.rpc.request("Switcheo.carbon.book.Query", "CombinedBookAll", data);
         return promise.then((data) => exports.QueryAllBookResponse.decode(new minimal_1.default.Reader(data)));
     }
     StopBookAll(request) {

package/lib/codec/Switcheo/carbon/broker/amm.d.ts

@@ -4,22 +4,20 @@ export declare const protobufPackage = "Switcheo.carbon.broker";
 /** SpotAmm exists when there is a quote on the orderbook */
 export interface SpotAmm {
     poolId: Long;
-    market: string;
+    marketId: string;
     reservesHash: Uint8Array;
-    orders: string[];
     poolRoute: Uint8Array;
 }
 /** PerpsAmm exists when there is at least 1 PerpsMarketAmm */
 export interface PerpsAmm {
     poolId: Long;
     quotingHash: Uint8Array;
-    lastQuotedAt: Long;
     markets: PerpsMarketAmm[];
+    lastQuotedAt?: Date;
 }
-/** PerpsMarketAmm exists when it is active or when there's orders or open position */
+/** PerpsMarketAmm exists when it is active/close-only */
 export interface PerpsMarketAmm {
-    market: string;
-    orders: string[];
+    marketId: string;
     lastIndexPrice: string;
 }
 export declare const SpotAmm: {

package/lib/codec/Switcheo/carbon/broker/amm.js

@@ -7,22 +7,20 @@ exports.PerpsMarketAmm = exports.PerpsAmm = exports.SpotAmm = exports.protobufPa
 /* eslint-disable */
 const long_1 = __importDefault(require("long"));
 const minimal_1 = __importDefault(require("protobufjs/minimal"));
+const timestamp_1 = require("../../../google/protobuf/timestamp");
 exports.protobufPackage = "Switcheo.carbon.broker";
-const baseSpotAmm = { poolId: long_1.default.UZERO, market: "", orders: "" };
+const baseSpotAmm = { poolId: long_1.default.UZERO, marketId: "" };
 exports.SpotAmm = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (!message.poolId.isZero()) {
             writer.uint32(8).uint64(message.poolId);
         }
-        if (message.market !== "") {
-            writer.uint32(18).string(message.market);
+        if (message.marketId !== "") {
+            writer.uint32(18).string(message.marketId);
         }
         if (message.reservesHash.length !== 0) {
             writer.uint32(26).bytes(message.reservesHash);
         }
-        for (const v of message.orders) {
-            writer.uint32(34).string(v);
-        }
         if (message.poolRoute.length !== 0) {
             writer.uint32(42).bytes(message.poolRoute);
         }
@@ -32,7 +30,6 @@ exports.SpotAmm = {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = Object.assign({}, baseSpotAmm);
-        message.orders = [];
         message.reservesHash = new Uint8Array();
         message.poolRoute = new Uint8Array();
         while (reader.pos < end) {
@@ -42,14 +39,11 @@ exports.SpotAmm = {
                     message.poolId = reader.uint64();
                     break;
                 case 2:
-                    message.market = reader.string();
+                    message.marketId = reader.string();
                     break;
                 case 3:
                     message.reservesHash = reader.bytes();
                     break;
-                case 4:
-                    message.orders.push(reader.string());
-                    break;
                 case 5:
                     message.poolRoute = reader.bytes();
                     break;
@@ -61,21 +55,19 @@ exports.SpotAmm = {
         return message;
     },
     fromJSON(object) {
-        var _a;
         const message = Object.assign({}, baseSpotAmm);
         message.poolId =
             object.poolId !== undefined && object.poolId !== null
                 ? long_1.default.fromString(object.poolId)
                 : long_1.default.UZERO;
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
         message.reservesHash =
             object.reservesHash !== undefined && object.reservesHash !== null
                 ? bytesFromBase64(object.reservesHash)
                 : new Uint8Array();
-        message.orders = ((_a = object.orders) !== null && _a !== void 0 ? _a : []).map((e) => String(e));
         message.poolRoute =
             object.poolRoute !== undefined && object.poolRoute !== null
                 ? bytesFromBase64(object.poolRoute)
@@ -86,36 +78,29 @@ exports.SpotAmm = {
         const obj = {};
         message.poolId !== undefined &&
             (obj.poolId = (message.poolId || long_1.default.UZERO).toString());
-        message.market !== undefined && (obj.market = message.market);
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         message.reservesHash !== undefined &&
             (obj.reservesHash = base64FromBytes(message.reservesHash !== undefined
                 ? message.reservesHash
                 : new Uint8Array()));
-        if (message.orders) {
-            obj.orders = message.orders.map((e) => e);
-        }
-        else {
-            obj.orders = [];
-        }
         message.poolRoute !== undefined &&
             (obj.poolRoute = base64FromBytes(message.poolRoute !== undefined ? message.poolRoute : new Uint8Array()));
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const message = Object.assign({}, baseSpotAmm);
         message.poolId =
             object.poolId !== undefined && object.poolId !== null
                 ? long_1.default.fromValue(object.poolId)
                 : long_1.default.UZERO;
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
         message.reservesHash = (_b = object.reservesHash) !== null && _b !== void 0 ? _b : new Uint8Array();
-        message.orders = ((_c = object.orders) !== null && _c !== void 0 ? _c : []).map((e) => e);
-        message.poolRoute = (_d = object.poolRoute) !== null && _d !== void 0 ? _d : new Uint8Array();
+        message.poolRoute = (_c = object.poolRoute) !== null && _c !== void 0 ? _c : new Uint8Array();
         return message;
     },
 };
-const basePerpsAmm = { poolId: long_1.default.UZERO, lastQuotedAt: long_1.default.UZERO };
+const basePerpsAmm = { poolId: long_1.default.UZERO };
 exports.PerpsAmm = {
     encode(message, writer = minimal_1.default.Writer.create()) {
         if (!message.poolId.isZero()) {
@@ -124,12 +109,12 @@ exports.PerpsAmm = {
         if (message.quotingHash.length !== 0) {
             writer.uint32(18).bytes(message.quotingHash);
         }
-        if (!message.lastQuotedAt.isZero()) {
-            writer.uint32(24).uint64(message.lastQuotedAt);
-        }
         for (const v of message.markets) {
             exports.PerpsMarketAmm.encode(v, writer.uint32(34).fork()).ldelim();
         }
+        if (message.lastQuotedAt !== undefined) {
+            timestamp_1.Timestamp.encode(toTimestamp(message.lastQuotedAt), writer.uint32(42).fork()).ldelim();
+        }
         return writer;
     },
     decode(input, length) {
@@ -147,12 +132,12 @@ exports.PerpsAmm = {
                 case 2:
                     message.quotingHash = reader.bytes();
                     break;
-                case 3:
-                    message.lastQuotedAt = reader.uint64();
-                    break;
                 case 4:
                     message.markets.push(exports.PerpsMarketAmm.decode(reader, reader.uint32()));
                     break;
+                case 5:
+                    message.lastQuotedAt = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
+                    break;
                 default:
                     reader.skipType(tag & 7);
                     break;
@@ -171,11 +156,11 @@ exports.PerpsAmm = {
             object.quotingHash !== undefined && object.quotingHash !== null
                 ? bytesFromBase64(object.quotingHash)
                 : new Uint8Array();
+        message.markets = ((_a = object.markets) !== null && _a !== void 0 ? _a : []).map((e) => exports.PerpsMarketAmm.fromJSON(e));
         message.lastQuotedAt =
             object.lastQuotedAt !== undefined && object.lastQuotedAt !== null
-                ? long_1.default.fromString(object.lastQuotedAt)
-                : long_1.default.UZERO;
-        message.markets = ((_a = object.markets) !== null && _a !== void 0 ? _a : []).map((e) => exports.PerpsMarketAmm.fromJSON(e));
+                ? fromJsonTimestamp(object.lastQuotedAt)
+                : undefined;
         return message;
     },
     toJSON(message) {
@@ -186,44 +171,34 @@ exports.PerpsAmm = {
             (obj.quotingHash = base64FromBytes(message.quotingHash !== undefined
                 ? message.quotingHash
                 : new Uint8Array()));
-        message.lastQuotedAt !== undefined &&
-            (obj.lastQuotedAt = (message.lastQuotedAt || long_1.default.UZERO).toString());
         if (message.markets) {
             obj.markets = message.markets.map((e) => e ? exports.PerpsMarketAmm.toJSON(e) : undefined);
         }
         else {
             obj.markets = [];
         }
+        message.lastQuotedAt !== undefined &&
+            (obj.lastQuotedAt = message.lastQuotedAt.toISOString());
         return obj;
     },
     fromPartial(object) {
-        var _a, _b;
+        var _a, _b, _c;
         const message = Object.assign({}, basePerpsAmm);
         message.poolId =
             object.poolId !== undefined && object.poolId !== null
                 ? long_1.default.fromValue(object.poolId)
                 : long_1.default.UZERO;
         message.quotingHash = (_a = object.quotingHash) !== null && _a !== void 0 ? _a : new Uint8Array();
-        message.lastQuotedAt =
-            object.lastQuotedAt !== undefined && object.lastQuotedAt !== null
-                ? long_1.default.fromValue(object.lastQuotedAt)
-                : long_1.default.UZERO;
         message.markets = ((_b = object.markets) !== null && _b !== void 0 ? _b : []).map((e) => exports.PerpsMarketAmm.fromPartial(e));
+        message.lastQuotedAt = (_c = object.lastQuotedAt) !== null && _c !== void 0 ? _c : undefined;
         return message;
     },
 };
-const basePerpsMarketAmm = {
-    market: "",
-    orders: "",
-    lastIndexPrice: "",
-};
+const basePerpsMarketAmm = { marketId: "", lastIndexPrice: "" };
 exports.PerpsMarketAmm = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.market !== "") {
-            writer.uint32(10).string(message.market);
-        }
-        for (const v of message.orders) {
-            writer.uint32(18).string(v);
+        if (message.marketId !== "") {
+            writer.uint32(10).string(message.marketId);
         }
         if (message.lastIndexPrice !== "") {
             writer.uint32(26).string(message.lastIndexPrice);
@@ -234,15 +209,11 @@ exports.PerpsMarketAmm = {
         const reader = input instanceof minimal_1.default.Reader ? input : new minimal_1.default.Reader(input);
         let end = length === undefined ? reader.len : reader.pos + length;
         const message = Object.assign({}, basePerpsMarketAmm);
-        message.orders = [];
         while (reader.pos < end) {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.market = reader.string();
-                    break;
-                case 2:
-                    message.orders.push(reader.string());
+                    message.marketId = reader.string();
                     break;
                 case 3:
                     message.lastIndexPrice = reader.string();
@@ -255,13 +226,11 @@ exports.PerpsMarketAmm = {
         return message;
     },
     fromJSON(object) {
-        var _a;
         const message = Object.assign({}, basePerpsMarketAmm);
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
-        message.orders = ((_a = object.orders) !== null && _a !== void 0 ? _a : []).map((e) => String(e));
         message.lastIndexPrice =
             object.lastIndexPrice !== undefined && object.lastIndexPrice !== null
                 ? String(object.lastIndexPrice)
@@ -270,23 +239,16 @@ exports.PerpsMarketAmm = {
     },
     toJSON(message) {
         const obj = {};
-        message.market !== undefined && (obj.market = message.market);
-        if (message.orders) {
-            obj.orders = message.orders.map((e) => e);
-        }
-        else {
-            obj.orders = [];
-        }
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         message.lastIndexPrice !== undefined &&
             (obj.lastIndexPrice = message.lastIndexPrice);
         return obj;
     },
     fromPartial(object) {
-        var _a, _b, _c;
+        var _a, _b;
         const message = Object.assign({}, basePerpsMarketAmm);
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
-        message.orders = ((_b = object.orders) !== null && _b !== void 0 ? _b : []).map((e) => e);
-        message.lastIndexPrice = (_c = object.lastIndexPrice) !== null && _c !== void 0 ? _c : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
+        message.lastIndexPrice = (_b = object.lastIndexPrice) !== null && _b !== void 0 ? _b : "";
         return message;
     },
 };
@@ -320,6 +282,30 @@ function base64FromBytes(arr) {
     }
     return btoa(bin.join(""));
 }
+function toTimestamp(date) {
+    const seconds = numberToLong(date.getTime() / 1000);
+    const nanos = (date.getTime() % 1000) * 1000000;
+    return { seconds, nanos };
+}
+function fromTimestamp(t) {
+    let millis = t.seconds.toNumber() * 1000;
+    millis += t.nanos / 1000000;
+    return new Date(millis);
+}
+function fromJsonTimestamp(o) {
+    if (o instanceof Date) {
+        return o;
+    }
+    else if (typeof o === "string") {
+        return new Date(o);
+    }
+    else {
+        return fromTimestamp(timestamp_1.Timestamp.fromJSON(o));
+    }
+}
+function numberToLong(number) {
+    return long_1.default.fromNumber(number);
+}
 if (minimal_1.default.util.Long !== long_1.default) {
     minimal_1.default.util.Long = long_1.default;
     minimal_1.default.configure();

package/lib/codec/Switcheo/carbon/broker/candlestick.d.ts

@@ -2,7 +2,7 @@ import Long from "long";
 import _m0 from "protobufjs/minimal";
 export declare const protobufPackage = "Switcheo.carbon.broker";
 export interface Candlestick {
-    market: string;
+    marketId: string;
     time?: Date;
     resolution: Long;
     open: string;

package/lib/codec/Switcheo/carbon/broker/candlestick.js

@@ -10,7 +10,7 @@ const minimal_1 = __importDefault(require("protobufjs/minimal"));
 const timestamp_1 = require("../../../google/protobuf/timestamp");
 exports.protobufPackage = "Switcheo.carbon.broker";
 const baseCandlestick = {
-    market: "",
+    marketId: "",
     resolution: long_1.default.UZERO,
     open: "",
     close: "",
@@ -22,8 +22,8 @@ const baseCandlestick = {
 };
 exports.Candlestick = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.market !== "") {
-            writer.uint32(10).string(message.market);
+        if (message.marketId !== "") {
+            writer.uint32(10).string(message.marketId);
         }
         if (message.time !== undefined) {
             timestamp_1.Timestamp.encode(toTimestamp(message.time), writer.uint32(18).fork()).ldelim();
@@ -62,7 +62,7 @@ exports.Candlestick = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.market = reader.string();
+                    message.marketId = reader.string();
                     break;
                 case 2:
                     message.time = fromTimestamp(timestamp_1.Timestamp.decode(reader, reader.uint32()));
@@ -100,9 +100,9 @@ exports.Candlestick = {
     },
     fromJSON(object) {
         const message = Object.assign({}, baseCandlestick);
-        message.market =
-            object.market !== undefined && object.market !== null
-                ? String(object.market)
+        message.marketId =
+            object.marketId !== undefined && object.marketId !== null
+                ? String(object.marketId)
                 : "";
         message.time =
             object.time !== undefined && object.time !== null
@@ -143,7 +143,7 @@ exports.Candlestick = {
     },
     toJSON(message) {
         const obj = {};
-        message.market !== undefined && (obj.market = message.market);
+        message.marketId !== undefined && (obj.marketId = message.marketId);
         message.time !== undefined && (obj.time = message.time.toISOString());
         message.resolution !== undefined &&
             (obj.resolution = (message.resolution || long_1.default.UZERO).toString());
@@ -161,7 +161,7 @@ exports.Candlestick = {
     fromPartial(object) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         const message = Object.assign({}, baseCandlestick);
-        message.market = (_a = object.market) !== null && _a !== void 0 ? _a : "";
+        message.marketId = (_a = object.marketId) !== null && _a !== void 0 ? _a : "";
         message.time = (_b = object.time) !== null && _b !== void 0 ? _b : undefined;
         message.resolution =
             object.resolution !== undefined && object.resolution !== null

package/lib/codec/Switcheo/carbon/broker/event.d.ts

@@ -5,7 +5,7 @@ export interface TradeEvent {
     id: Long;
     blockHeight: Long;
     blockCreatedAt?: Date;
-    market: string;
+    marketId: string;
     price: string;
     quantity: string;
     liquidation: string;
@@ -27,7 +27,7 @@ export interface TradeEvent {
     makerFeeCommissionAddress: string;
 }
 export interface FundingEvent {
-    marketName: string;
+    marketId: string;
     fundingRate: string;
     premiumRate: string;
     borrowRate: string;