juno-network 0.3.0 → 0.5.0

package/main/codegen/tendermint/types/validator.js

@@ -27,7 +27,7 @@ function createBaseValidatorSet() {
   return {
     validators: [],
     proposer: undefined,
-    total_voting_power: _helpers.Long.ZERO
+    totalVotingPower: _helpers.Long.ZERO
   };
 }
 
@@ -53,8 +53,8 @@ var ValidatorSet = {
       Validator.encode(message.proposer, writer.uint32(18).fork()).ldelim();
     }
 
-    if (!message.total_voting_power.isZero()) {
-      writer.uint32(24).int64(message.total_voting_power);
+    if (!message.totalVotingPower.isZero()) {
+      writer.uint32(24).int64(message.totalVotingPower);
     }
 
     return writer;
@@ -77,7 +77,7 @@ var ValidatorSet = {
           break;
 
         case 3:
-          message.total_voting_power = reader.int64();
+          message.totalVotingPower = reader.int64();
           break;
 
         default:
@@ -88,30 +88,6 @@ var ValidatorSet = {
 
     return message;
   },
-  fromJSON: function fromJSON(object) {
-    return {
-      validators: Array.isArray(object === null || object === void 0 ? void 0 : object.validators) ? object.validators.map(function (e) {
-        return Validator.fromJSON(e);
-      }) : [],
-      proposer: (0, _helpers.isSet)(object.proposer) ? Validator.fromJSON(object.proposer) : undefined,
-      total_voting_power: (0, _helpers.isSet)(object.total_voting_power) ? _helpers.Long.fromString(object.total_voting_power) : _helpers.Long.ZERO
-    };
-  },
-  toJSON: function toJSON(message) {
-    var obj = {};
-
-    if (message.validators) {
-      obj.validators = message.validators.map(function (e) {
-        return e ? Validator.toJSON(e) : undefined;
-      });
-    } else {
-      obj.validators = [];
-    }
-
-    message.proposer !== undefined && (obj.proposer = message.proposer ? Validator.toJSON(message.proposer) : undefined);
-    message.total_voting_power !== undefined && (obj.total_voting_power = (message.total_voting_power || _helpers.Long.ZERO).toString());
-    return obj;
-  },
   fromPartial: function fromPartial(object) {
     var _object$validators;
 
@@ -120,7 +96,7 @@ var ValidatorSet = {
       return Validator.fromPartial(e);
     })) || [];
     message.proposer = object.proposer !== undefined && object.proposer !== null ? Validator.fromPartial(object.proposer) : undefined;
-    message.total_voting_power = object.total_voting_power !== undefined && object.total_voting_power !== null ? _helpers.Long.fromValue(object.total_voting_power) : _helpers.Long.ZERO;
+    message.totalVotingPower = object.totalVotingPower !== undefined && object.totalVotingPower !== null ? _helpers.Long.fromValue(object.totalVotingPower) : _helpers.Long.ZERO;
     return message;
   }
 };
@@ -129,9 +105,9 @@ exports.ValidatorSet = ValidatorSet;
 function createBaseValidator() {
   return {
     address: new Uint8Array(),
-    pub_key: undefined,
-    voting_power: _helpers.Long.ZERO,
-    proposer_priority: _helpers.Long.ZERO
+    pubKey: undefined,
+    votingPower: _helpers.Long.ZERO,
+    proposerPriority: _helpers.Long.ZERO
   };
 }
 
@@ -143,16 +119,16 @@ var Validator = {
       writer.uint32(10).bytes(message.address);
     }
 
-    if (message.pub_key !== undefined) {
-      _keys.PublicKey.encode(message.pub_key, writer.uint32(18).fork()).ldelim();
+    if (message.pubKey !== undefined) {
+      _keys.PublicKey.encode(message.pubKey, writer.uint32(18).fork()).ldelim();
     }
 
-    if (!message.voting_power.isZero()) {
-      writer.uint32(24).int64(message.voting_power);
+    if (!message.votingPower.isZero()) {
+      writer.uint32(24).int64(message.votingPower);
     }
 
-    if (!message.proposer_priority.isZero()) {
-      writer.uint32(32).int64(message.proposer_priority);
+    if (!message.proposerPriority.isZero()) {
+      writer.uint32(32).int64(message.proposerPriority);
     }
 
     return writer;
@@ -171,15 +147,15 @@ var Validator = {
           break;
 
         case 2:
-          message.pub_key = _keys.PublicKey.decode(reader, reader.uint32());
+          message.pubKey = _keys.PublicKey.decode(reader, reader.uint32());
           break;
 
         case 3:
-          message.voting_power = reader.int64();
+          message.votingPower = reader.int64();
           break;
 
         case 4:
-          message.proposer_priority = reader.int64();
+          message.proposerPriority = reader.int64();
           break;
 
         default:
@@ -190,30 +166,14 @@ var Validator = {
 
     return message;
   },
-  fromJSON: function fromJSON(object) {
-    return {
-      address: (0, _helpers.isSet)(object.address) ? (0, _helpers.bytesFromBase64)(object.address) : new Uint8Array(),
-      pub_key: (0, _helpers.isSet)(object.pub_key) ? _keys.PublicKey.fromJSON(object.pub_key) : undefined,
-      voting_power: (0, _helpers.isSet)(object.voting_power) ? _helpers.Long.fromString(object.voting_power) : _helpers.Long.ZERO,
-      proposer_priority: (0, _helpers.isSet)(object.proposer_priority) ? _helpers.Long.fromString(object.proposer_priority) : _helpers.Long.ZERO
-    };
-  },
-  toJSON: function toJSON(message) {
-    var obj = {};
-    message.address !== undefined && (obj.address = (0, _helpers.base64FromBytes)(message.address !== undefined ? message.address : new Uint8Array()));
-    message.pub_key !== undefined && (obj.pub_key = message.pub_key ? _keys.PublicKey.toJSON(message.pub_key) : undefined);
-    message.voting_power !== undefined && (obj.voting_power = (message.voting_power || _helpers.Long.ZERO).toString());
-    message.proposer_priority !== undefined && (obj.proposer_priority = (message.proposer_priority || _helpers.Long.ZERO).toString());
-    return obj;
-  },
   fromPartial: function fromPartial(object) {
     var _object$address;
 
     var message = createBaseValidator();
     message.address = (_object$address = object.address) !== null && _object$address !== void 0 ? _object$address : new Uint8Array();
-    message.pub_key = object.pub_key !== undefined && object.pub_key !== null ? _keys.PublicKey.fromPartial(object.pub_key) : undefined;
-    message.voting_power = object.voting_power !== undefined && object.voting_power !== null ? _helpers.Long.fromValue(object.voting_power) : _helpers.Long.ZERO;
-    message.proposer_priority = object.proposer_priority !== undefined && object.proposer_priority !== null ? _helpers.Long.fromValue(object.proposer_priority) : _helpers.Long.ZERO;
+    message.pubKey = object.pubKey !== undefined && object.pubKey !== null ? _keys.PublicKey.fromPartial(object.pubKey) : undefined;
+    message.votingPower = object.votingPower !== undefined && object.votingPower !== null ? _helpers.Long.fromValue(object.votingPower) : _helpers.Long.ZERO;
+    message.proposerPriority = object.proposerPriority !== undefined && object.proposerPriority !== null ? _helpers.Long.fromValue(object.proposerPriority) : _helpers.Long.ZERO;
     return message;
   }
 };
@@ -221,8 +181,8 @@ exports.Validator = Validator;
 
 function createBaseSimpleValidator() {
   return {
-    pub_key: undefined,
-    voting_power: _helpers.Long.ZERO
+    pubKey: undefined,
+    votingPower: _helpers.Long.ZERO
   };
 }
 
@@ -230,12 +190,12 @@ var SimpleValidator = {
   encode: function encode(message) {
     var writer = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _m0.Writer.create();
 
-    if (message.pub_key !== undefined) {
-      _keys.PublicKey.encode(message.pub_key, writer.uint32(10).fork()).ldelim();
+    if (message.pubKey !== undefined) {
+      _keys.PublicKey.encode(message.pubKey, writer.uint32(10).fork()).ldelim();
     }
 
-    if (!message.voting_power.isZero()) {
-      writer.uint32(16).int64(message.voting_power);
+    if (!message.votingPower.isZero()) {
+      writer.uint32(16).int64(message.votingPower);
     }
 
     return writer;
@@ -250,11 +210,11 @@ var SimpleValidator = {
 
       switch (tag >>> 3) {
         case 1:
-          message.pub_key = _keys.PublicKey.decode(reader, reader.uint32());
+          message.pubKey = _keys.PublicKey.decode(reader, reader.uint32());
           break;
 
         case 2:
-          message.voting_power = reader.int64();
+          message.votingPower = reader.int64();
           break;
 
         default:
@@ -265,22 +225,10 @@ var SimpleValidator = {
 
     return message;
   },
-  fromJSON: function fromJSON(object) {
-    return {
-      pub_key: (0, _helpers.isSet)(object.pub_key) ? _keys.PublicKey.fromJSON(object.pub_key) : undefined,
-      voting_power: (0, _helpers.isSet)(object.voting_power) ? _helpers.Long.fromString(object.voting_power) : _helpers.Long.ZERO
-    };
-  },
-  toJSON: function toJSON(message) {
-    var obj = {};
-    message.pub_key !== undefined && (obj.pub_key = message.pub_key ? _keys.PublicKey.toJSON(message.pub_key) : undefined);
-    message.voting_power !== undefined && (obj.voting_power = (message.voting_power || _helpers.Long.ZERO).toString());
-    return obj;
-  },
   fromPartial: function fromPartial(object) {
     var message = createBaseSimpleValidator();
-    message.pub_key = object.pub_key !== undefined && object.pub_key !== null ? _keys.PublicKey.fromPartial(object.pub_key) : undefined;
-    message.voting_power = object.voting_power !== undefined && object.voting_power !== null ? _helpers.Long.fromValue(object.voting_power) : _helpers.Long.ZERO;
+    message.pubKey = object.pubKey !== undefined && object.pubKey !== null ? _keys.PublicKey.fromPartial(object.pubKey) : undefined;
+    message.votingPower = object.votingPower !== undefined && object.votingPower !== null ? _helpers.Long.fromValue(object.votingPower) : _helpers.Long.ZERO;
     return message;
   }
 };

package/main/codegen/tendermint/version/types.js

@@ -61,18 +61,6 @@ var App = {
 
     return message;
   },
-  fromJSON: function fromJSON(object) {
-    return {
-      protocol: (0, _helpers.isSet)(object.protocol) ? _helpers.Long.fromString(object.protocol) : _helpers.Long.UZERO,
-      software: (0, _helpers.isSet)(object.software) ? String(object.software) : ""
-    };
-  },
-  toJSON: function toJSON(message) {
-    var obj = {};
-    message.protocol !== undefined && (obj.protocol = (message.protocol || _helpers.Long.UZERO).toString());
-    message.software !== undefined && (obj.software = message.software);
-    return obj;
-  },
   fromPartial: function fromPartial(object) {
     var _object$software;
 
@@ -130,18 +118,6 @@ var Consensus = {
 
     return message;
   },
-  fromJSON: function fromJSON(object) {
-    return {
-      block: (0, _helpers.isSet)(object.block) ? _helpers.Long.fromString(object.block) : _helpers.Long.UZERO,
-      app: (0, _helpers.isSet)(object.app) ? _helpers.Long.fromString(object.app) : _helpers.Long.UZERO
-    };
-  },
-  toJSON: function toJSON(message) {
-    var obj = {};
-    message.block !== undefined && (obj.block = (message.block || _helpers.Long.UZERO).toString());
-    message.app !== undefined && (obj.app = (message.app || _helpers.Long.UZERO).toString());
-    return obj;
-  },
   fromPartial: function fromPartial(object) {
     var message = createBaseConsensus();
     message.block = object.block !== undefined && object.block !== null ? _helpers.Long.fromValue(object.block) : _helpers.Long.UZERO;

package/main/index.js

@@ -15,8 +15,4 @@ Object.keys(_codegen).forEach(function (key) {
       return _codegen[key];
     }
   });
-});
-// contracts.JunoSwap.JunoSwapClient
-var _contracts$JunoSwap = _codegen.contracts.JunoSwap,
-    JunoSwapClient = _contracts$JunoSwap.JunoSwapClient,
-    JunoSwapQueryClient = _contracts$JunoSwap.JunoSwapQueryClient;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juno-network",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "juno",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "homepage": "https://github.com/CosmosContracts/typescript#readme",
@@ -53,7 +53,7 @@
     "@babel/plugin-transform-runtime": "7.19.1",
     "@babel/preset-env": "7.19.1",
     "@babel/preset-typescript": "^7.18.6",
-    "@osmonauts/telescope": "^0.23.0",
+    "@osmonauts/telescope": "^0.33.0",
     "@protobufs/cosmos": "^0.0.11",
     "@protobufs/cosmwasm": "^0.0.11",
     "@protobufs/ibc": "^0.0.11",
@@ -82,9 +82,9 @@
     "@cosmjs/proto-signing": "0.29.0",
     "@cosmjs/stargate": "0.29.0",
     "@cosmjs/tendermint-rpc": "^0.29.0",
-    "@osmonauts/helpers": "^0.5.0",
-    "@osmonauts/lcd": "0.5.0",
+    "@osmonauts/helpers": "^0.6.0",
+    "@osmonauts/lcd": "0.6.0",
     "protobufjs": "^6.11.2"
   },
-  "gitHead": "f0f12af5f93b00f2d48c5357613f3bb74f2b22d5"
+  "gitHead": "f60c005369016e3a4d2ef8937635acb78d5ec377"
 }

package/types/codegen/JunoSwap.client.d.ts

@@ -0,0 +1,120 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@0.16.1.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import { Uint128, BalanceResponse, Expiration, TokenSelect, Addr, InfoResponse, Token1ForToken2PriceResponse, Token2ForToken1PriceResponse } from "./JunoSwap.types";
+export interface JunoSwapReadOnlyInterface {
+    contractAddress: string;
+    balance: ({ address }: {
+        address: string;
+    }) => Promise<BalanceResponse>;
+    info: () => Promise<InfoResponse>;
+    token1ForToken2Price: ({ token1Amount }: {
+        token1Amount: Uint128;
+    }) => Promise<Token1ForToken2PriceResponse>;
+    token2ForToken1Price: ({ token2Amount }: {
+        token2Amount: Uint128;
+    }) => Promise<Token2ForToken1PriceResponse>;
+}
+export declare class JunoSwapQueryClient implements JunoSwapReadOnlyInterface {
+    client: CosmWasmClient;
+    contractAddress: string;
+    constructor(client: CosmWasmClient, contractAddress: string);
+    balance: ({ address }: {
+        address: string;
+    }) => Promise<BalanceResponse>;
+    info: () => Promise<InfoResponse>;
+    token1ForToken2Price: ({ token1Amount }: {
+        token1Amount: Uint128;
+    }) => Promise<Token1ForToken2PriceResponse>;
+    token2ForToken1Price: ({ token2Amount }: {
+        token2Amount: Uint128;
+    }) => Promise<Token2ForToken1PriceResponse>;
+}
+export interface JunoSwapInterface extends JunoSwapReadOnlyInterface {
+    contractAddress: string;
+    sender: string;
+    addLiquidity: ({ expiration, maxToken2, minLiquidity, token1Amount }: {
+        expiration?: Expiration;
+        maxToken2: Uint128;
+        minLiquidity: Uint128;
+        token1Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    removeLiquidity: ({ amount, expiration, minToken1, minToken2 }: {
+        amount: Uint128;
+        expiration?: Expiration;
+        minToken1: Uint128;
+        minToken2: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapToken1ForToken2: ({ expiration, minToken2, token1Amount }: {
+        expiration?: Expiration;
+        minToken2: Uint128;
+        token1Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapToken2ForToken1: ({ expiration, minToken1, token2Amount }: {
+        expiration?: Expiration;
+        minToken1: Uint128;
+        token2Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    multiContractSwap: ({ expiration, inputToken, inputTokenAmount, outputAmmAddress, outputMinToken, outputToken }: {
+        expiration?: Expiration;
+        inputToken: TokenSelect;
+        inputTokenAmount: Uint128;
+        outputAmmAddress: Addr;
+        outputMinToken: Uint128;
+        outputToken: TokenSelect;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapTo: ({ expiration, inputAmount, inputToken, minToken, recipient }: {
+        expiration?: Expiration;
+        inputAmount: Uint128;
+        inputToken: TokenSelect;
+        minToken: Uint128;
+        recipient: Addr;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export declare class JunoSwapClient extends JunoSwapQueryClient implements JunoSwapInterface {
+    client: SigningCosmWasmClient;
+    sender: string;
+    contractAddress: string;
+    constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string);
+    addLiquidity: ({ expiration, maxToken2, minLiquidity, token1Amount }: {
+        expiration?: Expiration;
+        maxToken2: Uint128;
+        minLiquidity: Uint128;
+        token1Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    removeLiquidity: ({ amount, expiration, minToken1, minToken2 }: {
+        amount: Uint128;
+        expiration?: Expiration;
+        minToken1: Uint128;
+        minToken2: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapToken1ForToken2: ({ expiration, minToken2, token1Amount }: {
+        expiration?: Expiration;
+        minToken2: Uint128;
+        token1Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapToken2ForToken1: ({ expiration, minToken1, token2Amount }: {
+        expiration?: Expiration;
+        minToken1: Uint128;
+        token2Amount: Uint128;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    multiContractSwap: ({ expiration, inputToken, inputTokenAmount, outputAmmAddress, outputMinToken, outputToken }: {
+        expiration?: Expiration;
+        inputToken: TokenSelect;
+        inputTokenAmount: Uint128;
+        outputAmmAddress: Addr;
+        outputMinToken: Uint128;
+        outputToken: TokenSelect;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+    swapTo: ({ expiration, inputAmount, inputToken, minToken, recipient }: {
+        expiration?: Expiration;
+        inputAmount: Uint128;
+        inputToken: TokenSelect;
+        minToken: Uint128;
+        recipient: Addr;
+    }, fee?: number | StdFee | "auto", memo?: string, funds?: Coin[]) => Promise<ExecuteResult>;
+}

package/types/codegen/JunoSwap.types.d.ts

@@ -0,0 +1,124 @@
+/**
+* This file was automatically generated by @cosmwasm/ts-codegen@0.16.1.
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @cosmwasm/ts-codegen generate command to regenerate this file.
+*/
+export declare type Uint128 = string;
+export interface BalanceResponse {
+    balance: Uint128;
+    [k: string]: unknown;
+}
+export declare type ExecuteMsg = {
+    add_liquidity: {
+        expiration?: Expiration | null;
+        max_token2: Uint128;
+        min_liquidity: Uint128;
+        token1_amount: Uint128;
+        [k: string]: unknown;
+    };
+} | {
+    remove_liquidity: {
+        amount: Uint128;
+        expiration?: Expiration | null;
+        min_token1: Uint128;
+        min_token2: Uint128;
+        [k: string]: unknown;
+    };
+} | {
+    swap_token1_for_token2: {
+        expiration?: Expiration | null;
+        min_token2: Uint128;
+        token1_amount: Uint128;
+        [k: string]: unknown;
+    };
+} | {
+    swap_token2_for_token1: {
+        expiration?: Expiration | null;
+        min_token1: Uint128;
+        token2_amount: Uint128;
+        [k: string]: unknown;
+    };
+} | {
+    multi_contract_swap: {
+        expiration?: Expiration | null;
+        input_token: TokenSelect;
+        input_token_amount: Uint128;
+        output_amm_address: Addr;
+        output_min_token: Uint128;
+        output_token: TokenSelect;
+        [k: string]: unknown;
+    };
+} | {
+    swap_to: {
+        expiration?: Expiration | null;
+        input_amount: Uint128;
+        input_token: TokenSelect;
+        min_token: Uint128;
+        recipient: Addr;
+        [k: string]: unknown;
+    };
+};
+export declare type Expiration = {
+    at_height: number;
+} | {
+    at_time: Timestamp;
+} | {
+    never: {
+        [k: string]: unknown;
+    };
+};
+export declare type Timestamp = Uint64;
+export declare type Uint64 = string;
+export declare type TokenSelect = "Token1" | "Token2";
+export declare type Addr = string;
+export interface InfoResponse {
+    lp_token_supply: Uint128;
+    token1_address?: string | null;
+    token1_denom: string;
+    token1_reserve: Uint128;
+    token2_address?: string | null;
+    token2_denom: string;
+    token2_reserve: Uint128;
+    [k: string]: unknown;
+}
+export interface InstantiateMsg {
+    token1_address?: Addr | null;
+    token1_denom: string;
+    token2_address?: Addr | null;
+    token2_denom: string;
+    [k: string]: unknown;
+}
+export declare type QueryMsg = {
+    balance: {
+        address: string;
+        [k: string]: unknown;
+    };
+} | {
+    info: {
+        [k: string]: unknown;
+    };
+} | {
+    token1_for_token2_price: {
+        token1_amount: Uint128;
+        [k: string]: unknown;
+    };
+} | {
+    token2_for_token1_price: {
+        token2_amount: Uint128;
+        [k: string]: unknown;
+    };
+};
+export interface Token {
+    address?: Addr | null;
+    denom: string;
+    reserve: Uint128;
+    [k: string]: unknown;
+}
+export interface Token1ForToken2PriceResponse {
+    token2_amount: Uint128;
+    [k: string]: unknown;
+}
+export interface Token2ForToken1PriceResponse {
+    token1_amount: Uint128;
+    [k: string]: unknown;
+}