carbon-js-sdk 0.6.1-test2 → 0.6.2-beta.1

package/lib/CarbonSDK.d.ts

@@ -49,6 +49,7 @@ declare class CarbonSDK {
         CDPToken: string;
     };
     readonly query: CarbonQueryClient;
+    readonly useTmAbciQuery: boolean;
     insights: InsightsQueryClient;
     hydrogen: HydrogenClient;
     wallet?: CarbonWallet;

package/lib/CarbonSDK.js

@@ -62,26 +62,27 @@ const DEFAULT_SDK_INIT_OPTS = {
  */
 class CarbonSDK {
     constructor(opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.network = (_a = opts.network) !== null && _a !== void 0 ? _a : constant_1.DEFAULT_NETWORK;
         this.configOverride = (_b = opts.config) !== null && _b !== void 0 ? _b : {};
         this.networkConfig = util_1.GenericUtils.overrideConfig(constant_1.NetworkConfigs[this.network], this.configOverride);
+        this.useTmAbciQuery = (_c = opts.useTmAbciQuery) !== null && _c !== void 0 ? _c : false;
         this.tmClient = opts.tmClient;
-        this.chainId = (_d = (_c = opts.chainId) !== null && _c !== void 0 ? _c : constant_1.CarbonChainIDs[this.network]) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
-        this.evmChainId = (_f = (_e = opts.evmChainId) !== null && _e !== void 0 ? _e : constant_1.CarbonEvmChainIDs[this.network]) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
+        this.chainId = (_e = (_d = opts.chainId) !== null && _d !== void 0 ? _d : constant_1.CarbonChainIDs[this.network]) !== null && _e !== void 0 ? _e : constant_1.CarbonChainIDs[constant_1.Network.MainNet];
+        this.evmChainId = (_g = (_f = opts.evmChainId) !== null && _f !== void 0 ? _f : constant_1.CarbonEvmChainIDs[this.network]) !== null && _g !== void 0 ? _g : constant_1.CarbonEvmChainIDs[constant_1.Network.MainNet];
         let grpcClient;
         if (opts.useTmAbciQuery !== true && this.networkConfig.grpcUrl) {
-            const hasNodeGrpc = GrpcQueryClient_1.default.hasNodeGrpc();
-            const grpcUrl = hasNodeGrpc ? this.networkConfig.grpcUrl : this.networkConfig.grpcWebUrl;
             const transport = typeof window === "undefined" ? grpc_web_node_http_transport_1.NodeHttpTransport() : undefined;
-            grpcClient = (_g = opts.grpcQueryClient) !== null && _g !== void 0 ? _g : new GrpcQueryClient_1.default(grpcUrl, { transport });
+            grpcClient = (_h = opts.grpcQueryClient) !== null && _h !== void 0 ? _h : new GrpcQueryClient_1.default(this.networkConfig.grpcWebUrl, {
+                transport,
+            });
         }
         this.query = new clients_1.CarbonQueryClient({
             tmClient: this.tmClient,
             grpcClient,
         });
         this.insights = new clients_1.InsightsQueryClient(this.networkConfig);
-        this.token = (_h = opts.token) !== null && _h !== void 0 ? _h : clients_1.TokenClient.instance(this.query, this);
+        this.token = (_j = opts.token) !== null && _j !== void 0 ? _j : clients_1.TokenClient.instance(this.query, this);
         this.hydrogen = new clients_1.HydrogenClient(this.networkConfig, this.token);
         this.hydrogen = clients_1.HydrogenClient.instance(this.networkConfig, this.token);
         this.admin = new modules_1.AdminModule(this);
@@ -238,6 +239,7 @@ class CarbonSDK {
             config: this.configOverride,
             tmClient: this.tmClient,
             chainId: this.chainId,
+            useTmAbciQuery: this.useTmAbciQuery,
         };
     }
     connect(wallet) {

package/lib/clients/ETHClient.d.ts

@@ -41,6 +41,7 @@ export interface LockParams extends ETHTxParams {
 export interface ApproveERC20Params extends ETHTxParams {
     token: Models.Token;
     spenderAddress?: string;
+    amount?: BigNumber;
     signCompleteCallback?: () => void;
 }
 export interface EthersTransactionResponse extends ethers.Transaction {

package/lib/clients/ETHClient.js

@@ -70,12 +70,12 @@ class ETHClient {
     }
     approveERC20(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer } = params;
+            const { token, gasPriceGwei, gasLimit, ethAddress, spenderAddress, signer, amount } = params;
             const contractAddress = token.tokenAddress;
             const rpcProvider = this.getProvider();
             const contract = new ethers_1.ethers.Contract(contractAddress, eth_1.ABIs.erc20, rpcProvider);
             const nonce = yield this.getTxNonce(ethAddress, params.nonce, rpcProvider);
-            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
+            const approveResultTx = yield contract.connect(signer).approve(spenderAddress !== null && spenderAddress !== void 0 ? spenderAddress : token.bridgeAddress, amount !== null && amount !== void 0 ? amount : ethers_1.ethers.constants.MaxUint256, Object.assign(Object.assign({ nonce }, gasPriceGwei && ({ gasPrice: gasPriceGwei.shiftedBy(9).toString(10) })), gasLimit && ({ gasLimit: gasLimit.toString(10) })));
             return approveResultTx;
         });
     }

package/lib/clients/GrpcQueryClient.d.ts

@@ -5,22 +5,18 @@ export declare class GrpcWebError extends Error {
     metadata: grpc.Metadata;
     constructor(message: string, code: grpc.Code, metadata: grpc.Metadata);
 }
+/**
+ * Uses grpc-web module on cosmos-sdk to simulate gRPC queries
+ * throught HTTP/1.1.
+ * see https://github.com/cosmos/cosmos-sdk/issues/7345
+ */
 export declare class GrpcQueryClient implements ProtobufRpcClient {
     private host;
     private options;
-    private useGrpcJs;
     constructor(host: string, options?: {
         transport?: grpc.TransportFactory;
         metadata?: grpc.Metadata;
     });
-    static hasNodeGrpc(): boolean;
-    request(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
-    _requestGrpc(service: string, method: string, data: Uint8Array): Promise<Uint8Array>;
-    /**
-     * Uses grpc-web module on cosmos-sdk to simulate gRPC queries
-     * throught HTTP/1.1.
-     * see https://github.com/cosmos/cosmos-sdk/issues/7345
-     */
-    _requestGrpcWeb(serviceName: string, methodName: string, data: Uint8Array): Promise<Uint8Array>;
+    request(serviceName: string, methodName: string, data: Uint8Array): Promise<Uint8Array>;
 }
 export default GrpcQueryClient;

package/lib/clients/GrpcQueryClient.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GrpcQueryClient = exports.GrpcWebError = void 0;
 const grpc_web_1 = require("@improbable-eng/grpc-web");
-const grpc_web_node_http_transport_1 = require("@improbable-eng/grpc-web-node-http-transport");
 class GrpcWebError extends Error {
     constructor(message, code, metadata) {
         super(message);
@@ -11,63 +10,17 @@ class GrpcWebError extends Error {
     }
 }
 exports.GrpcWebError = GrpcWebError;
-const passThrough = (incoming) => incoming;
-const passThroughBuffer = (incoming) => Buffer.from(incoming);
+/**
+ * Uses grpc-web module on cosmos-sdk to simulate gRPC queries
+ * throught HTTP/1.1.
+ * see https://github.com/cosmos/cosmos-sdk/issues/7345
+ */
 class GrpcQueryClient {
     constructor(host, options = {}) {
         this.host = host;
         this.options = options;
-        this.useGrpcJs = GrpcQueryClient.hasNodeGrpc() && typeof window === "undefined";
     }
-    static hasNodeGrpc() {
-        try {
-            return require("@grpc/grpc-js").version; // eslint-disable-line 
-        }
-        catch (error) {
-            return false;
-        }
-    }
-    request(service, method, data) {
-        return this.useGrpcJs ? this._requestGrpc(service, method, data) : this._requestGrpcWeb(service, method, data);
-    }
-    _requestGrpc(service, method, data) {
-        var _a, _b;
-        const path = ["", service, method].join("/");
-        try {
-            const { credentials, makeGenericClientConstructor } = require("@grpc/grpc-js"); // eslint-disable-line 
-            const client = new (makeGenericClientConstructor({
-                runQuery: {
-                    path,
-                    requestStream: false,
-                    responseStream: false,
-                    requestSerialize: passThroughBuffer,
-                    requestDeserialize: passThrough,
-                    responseSerialize: passThroughBuffer,
-                    responseDeserialize: passThrough,
-                }
-            }, service))(this.host, credentials.createSsl());
-            return new Promise((resolve, reject) => {
-                client.runQuery(data, (error, value) => {
-                    if (error)
-                        reject(error);
-                    else
-                        resolve(value);
-                });
-            });
-        }
-        catch (error) {
-            if ((_b = (_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.startsWith) === null || _b === void 0 ? void 0 : _b.call(_a, "Cannot find module '@grpc/grpc-js'")) {
-                throw new Error("Please install @grpc/grpc-js, refer to README.md for more information.");
-            }
-            throw error;
-        }
-    }
-    /**
-     * Uses grpc-web module on cosmos-sdk to simulate gRPC queries
-     * throught HTTP/1.1.
-     * see https://github.com/cosmos/cosmos-sdk/issues/7345
-     */
-    _requestGrpcWeb(serviceName, methodName, data) {
+    request(serviceName, methodName, data) {
         return new Promise((resolve, reject) => {
             grpc_web_1.grpc.unary({
                 methodName,
@@ -82,7 +35,7 @@ class GrpcQueryClient {
                 request: Object.assign(Object.assign({}, data), { toObject: () => data, serializeBinary: () => data }),
                 host: this.host,
                 metadata: this.options.metadata,
-                transport: grpc_web_node_http_transport_1.NodeHttpTransport(),
+                transport: this.options.transport,
                 debug: false,
                 onEnd: function (response) {
                     if (response.status === grpc_web_1.grpc.Code.OK) {

package/lib/clients/NEOClient.js

@@ -32,7 +32,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NEOClient = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const constant_1 = require("../constant");
 const util_1 = require("../util");
 const address_1 = require("../util/address");
@@ -139,9 +138,7 @@ class NEOClient {
                 nonce,
             ]);
             const rpcUrl = yield this.getProviderUrl();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             return neon_js_1.api.doInvoke({
                 api: apiProvider,
                 url: rpcUrl,
@@ -221,9 +218,7 @@ class NEOClient {
             ];
             sb.emitAppCall(scriptHash, "lock", data);
             const rpcUrl = yield this.getProviderUrl();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             let invokeTxConfig = {
                 account: Object.assign(Object.assign({}, new Neon.wallet.Account("")), { 
                     // overwrite the address and public key to values provided by the ledger.
@@ -285,10 +280,7 @@ class NEOClient {
                 args: [],
             };
             const script = Neon.sc.createScript(props);
-            const networkConfig = this.getNetworkConfig();
-            const apiProvider = networkConfig.network === CarbonSDK_1.default.Network.MainNet
-                ? new neon_js_1.api.neonDB.instance("https://api.switcheo.network")
-                : new neon_js_1.api.neoCli.instance(rpcUrl);
+            const apiProvider = new neon_js_1.api.neoCli.instance(rpcUrl);
             const config = {
                 api: apiProvider,
                 url: rpcUrl,

package/lib/codec/perpsliquidity/event.d.ts

@@ -0,0 +1,115 @@
+import Long from "long";
+import _m0 from "protobufjs/minimal";
+import { PlPool } from "./pool";
+import { MarketConfig } from "./market";
+export declare const protobufPackage = "Switcheo.carbon.perpsliquidity";
+export interface SetPoolEvent {
+    pool?: PlPool;
+    type: string;
+}
+export interface NewPoolEvent {
+    pool?: PlPool;
+}
+export interface UpdatePoolEvent {
+    pool?: PlPool;
+}
+export interface RegisterToPoolEvent {
+    poolId: Long;
+    marketId: string;
+}
+export interface DeregisterFromPoolEvent {
+    poolId: Long;
+    marketId: string;
+}
+export interface SetMarketConfigEvent {
+    marketConfig?: MarketConfig;
+}
+export interface DepositToPoolEvent {
+    poolId: Long;
+    denom: string;
+    amount: string;
+    shareDenom: string;
+    shareAmount: string;
+    initialShareAmountBurnt: string;
+    depositor: string;
+}
+export interface WithdrawFromPoolEvent {
+    poolId: Long;
+    denom: string;
+    amount: string;
+    shareDenom: string;
+    shareAmount: string;
+    withdrawer: string;
+}
+export interface UpdateMarketUtilizationMultiplierEvent {
+    market: string;
+    multiplier: string;
+}
+export declare const SetPoolEvent: {
+    encode(message: SetPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): SetPoolEvent;
+    fromJSON(object: any): SetPoolEvent;
+    toJSON(message: SetPoolEvent): unknown;
+    fromPartial(object: DeepPartial<SetPoolEvent>): SetPoolEvent;
+};
+export declare const NewPoolEvent: {
+    encode(message: NewPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): NewPoolEvent;
+    fromJSON(object: any): NewPoolEvent;
+    toJSON(message: NewPoolEvent): unknown;
+    fromPartial(object: DeepPartial<NewPoolEvent>): NewPoolEvent;
+};
+export declare const UpdatePoolEvent: {
+    encode(message: UpdatePoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): UpdatePoolEvent;
+    fromJSON(object: any): UpdatePoolEvent;
+    toJSON(message: UpdatePoolEvent): unknown;
+    fromPartial(object: DeepPartial<UpdatePoolEvent>): UpdatePoolEvent;
+};
+export declare const RegisterToPoolEvent: {
+    encode(message: RegisterToPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): RegisterToPoolEvent;
+    fromJSON(object: any): RegisterToPoolEvent;
+    toJSON(message: RegisterToPoolEvent): unknown;
+    fromPartial(object: DeepPartial<RegisterToPoolEvent>): RegisterToPoolEvent;
+};
+export declare const DeregisterFromPoolEvent: {
+    encode(message: DeregisterFromPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): DeregisterFromPoolEvent;
+    fromJSON(object: any): DeregisterFromPoolEvent;
+    toJSON(message: DeregisterFromPoolEvent): unknown;
+    fromPartial(object: DeepPartial<DeregisterFromPoolEvent>): DeregisterFromPoolEvent;
+};
+export declare const SetMarketConfigEvent: {
+    encode(message: SetMarketConfigEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): SetMarketConfigEvent;
+    fromJSON(object: any): SetMarketConfigEvent;
+    toJSON(message: SetMarketConfigEvent): unknown;
+    fromPartial(object: DeepPartial<SetMarketConfigEvent>): SetMarketConfigEvent;
+};
+export declare const DepositToPoolEvent: {
+    encode(message: DepositToPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): DepositToPoolEvent;
+    fromJSON(object: any): DepositToPoolEvent;
+    toJSON(message: DepositToPoolEvent): unknown;
+    fromPartial(object: DeepPartial<DepositToPoolEvent>): DepositToPoolEvent;
+};
+export declare const WithdrawFromPoolEvent: {
+    encode(message: WithdrawFromPoolEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): WithdrawFromPoolEvent;
+    fromJSON(object: any): WithdrawFromPoolEvent;
+    toJSON(message: WithdrawFromPoolEvent): unknown;
+    fromPartial(object: DeepPartial<WithdrawFromPoolEvent>): WithdrawFromPoolEvent;
+};
+export declare const UpdateMarketUtilizationMultiplierEvent: {
+    encode(message: UpdateMarketUtilizationMultiplierEvent, writer?: _m0.Writer): _m0.Writer;
+    decode(input: _m0.Reader | Uint8Array, length?: number | undefined): UpdateMarketUtilizationMultiplierEvent;
+    fromJSON(object: any): UpdateMarketUtilizationMultiplierEvent;
+    toJSON(message: UpdateMarketUtilizationMultiplierEvent): unknown;
+    fromPartial(object: DeepPartial<UpdateMarketUtilizationMultiplierEvent>): UpdateMarketUtilizationMultiplierEvent;
+};
+declare type Builtin = Date | Function | Uint8Array | string | number | boolean | undefined;
+export declare type DeepPartial<T> = T extends Builtin ? T : T extends Long ? string | number | Long : T extends Array<infer U> ? Array<DeepPartial<U>> : T extends ReadonlyArray<infer U> ? ReadonlyArray<DeepPartial<U>> : T extends {} ? {
+    [K in keyof T]?: DeepPartial<T[K]>;
+} : Partial<T>;
+export {};