Skip to content

Commit

Permalink
Merge branch 'dev' into chore/chain-v50-canary
Browse files Browse the repository at this point in the history
  • Loading branch information
shane-moore committed Jul 24, 2024
2 parents 4d71d68 + c31d269 commit b813000
Show file tree
Hide file tree
Showing 32 changed files with 617 additions and 332 deletions.
188 changes: 94 additions & 94 deletions .gitbook/SUMMARY.md
Original file line number Diff line number Diff line change
@@ -1,96 +1,96 @@
# Table of contents

- [Getting Started](README.md)
- [Technical Concepts](readme/technical-concepts.md)
- [Application Concepts](readme/application-concepts.md)
- [Assets](readme/assets/README.md)
- [Creating Tokens](readme/assets/creating-tokens.md)
- [Denom Client (deprecated)](readme/assets/denom-client.md)
- [Injective-lists](readme/assets/injective-list.md)
- [Token Price]()
- [Networks](readme/networks.md)
- [CosmJs Support](readme/getting-started-cosmjs.md)
- [Running examples](readme/running-examples.md)
- [Wallet](wallet/README.md)
- [Accounts](wallet/wallet-accounts.md)
- [Wallet Connections](wallet/wallet-connections.md)
- [Wallet Strategy](wallet/wallet-wallet-strategy.md)
- [Offchain (Arbitrary) Data](wallet/offchain-arbitrary-data.md)
- [Querying](querying/README.md)
- [Indexer](querying/querying-api/README.md)
- [Account](querying/querying-api/querying-indexer-account.md)
- [Auction](querying/querying-api/querying-indexer-auction.md)
- [Derivatives](querying/querying-api/querying-indexer-derivatives.md)
- [Explorer](querying/querying-api/querying-indexer-explorer.md)
- [Insurance Funds](querying/querying-api/querying-indexer-insurance-funds.md)
- [Markets](querying/querying-api/querying-indexer-markets.md)
- [Leaderboard](querying/querying-api/querying-indexer-leaderboard.md)
- [Mito](querying/querying-api/querying-indexer-mito.md)
- [Oracle](querying/querying-api/querying-indexer-oracle.md)
- [Portfolio](querying/querying-api/querying-indexer-portfolio.md)
- [Spot](querying/querying-api/querying-indexer-spot.md)
- [Web3Gw Transactions](querying/querying-api/querying-indexer-transaction.md)
- [Streaming](querying/querying-api/streaming/README.md)
- [Account](querying/querying-api/streaming/streaming-indexer-account.md)
- [Auction](querying/querying-api/streaming/streaming-indexer-auction.md)
- [Derivatives](querying/querying-api/streaming/streaming-indexer-derivatives.md)
- [Oracle](querying/querying-api/streaming/streaming-indexer-oracle.md)
- [Portfolio](querying/querying-api/streaming/streaming-indexer-portfolio.md)
- [Spot](querying/querying-api/streaming/streaming-indexer-spot.md)
- [Explorer](querying/querying-api/streaming/streaming-indexer-explorer.md)
- [Chain](querying/querying-chain/README.md)
- [Auction](querying/querying-chain/querying-chain-auction-module.md)
- [Auth](querying/querying-chain/querying-chain-auth-module.md)
- [Bank](querying/querying-chain/querying-chain-bank-module.md)
- [Distribution](querying/querying-chain/querying-chain-distribution.md)
- [Exchange](querying/querying-chain/querying-chain-exchange.md)
- [Governance](querying/querying-chain/querying-chain-governance.md)
- [IBC](querying/querying-chain/querying-chain-ibc.md)
- [Mint](querying/querying-chain/querying-chain-mint.md)
- [Insurance Funds](querying/querying-chain/querying-chain-insurance-funds.md)
- [Oracle](querying/querying-chain/querying-chain-oracle.md)
- [Peggy](querying/querying-chain/querying-chain-peggy.md)
- [Staking](querying/querying-chain/querying-chain-staking.md)
- [Tendermint](querying/querying-chain/querying-chain-tendermint.md)
- [Wasm](querying/querying-chain/querying-chain-wasm.md)
- [WasmX](querying/querying-chain/querying-chain-wasmx.md)
- [Token Factory](querying/querying-chain/token-factory.md)
- [Ethereum (GraphQL)](querying/querying-ethereum.md)
- [Transactions](transactions/README.md)
- [Cosmos](transactions/transactions-cosmos/README.md)
- [Ledger through Keplr Wallet](transactions/transactions-cosmos/ledger-through-keplr-wallet.md)
- [Ethereum](transactions/ethereum.md)
- [Ethereum Ledger](transactions/ethereum-ledger.md)
- [MsgBroadcaster](transactions/msgbroadcaster.md)
- [Private Key](transactions/private-key.md)
- [Web3 Gateway](transactions/web3-gateway.md)
- [Core Modules](core-modules/README.md)
- [Auction](core-modules/auction.md)
- [AuthZ](core-modules/authz.md)
- [Bank](core-modules/bank.md)
- [Distribution](core-modules/distribution.md)
- [Exchange](core-modules/exchange.md)
- [Feegrant](core-modules/feegrant.md)
- [Governance](core-modules/governance.md)
- [IBC](core-modules/ibc.md)
- [Insurance](core-modules/insurance.md)
- [Peggy](core-modules/peggy.md)
- [Staking](core-modules/staking.md)
- [Tokenfactory](core-modules/token-factory.md)
- [Wasm](core-modules/wasm.md)
- [Bridge](bridge/README.md)
- [Ethereum](bridge/ethereum.md)
- [IBC](bridge/ibc.md)
- [Wormhole](bridge/wormhole.md)
- [Contracts](contracts/README.md)
- [Injective Name Service](contracts/injective-name-service.md)
- [Building dApps](building-dapps/README.md)
- [Configuring Nuxt](building-dapps/configuring-nuxt.md)
- [Configuring React](building-dapps/configuring-react.md)
- [dApps Examples](building-dapps/dapps-examples/README.md)
- [Smart Contract](building-dapps/smart-contract.md)
- [DEX](building-dapps/dex.md)
- [Bridge](building-dapps/bridge.md)
- [Calculations](calculations/README.md)
- [Min Price Tick Size](calculations/min-price-tick-size.md)
- [Min Quantity Tick Size](calculations/min-quantity-tick-size.md)
* [Getting Started](README.md)
* [Technical Concepts](readme/technical-concepts.md)
* [Application Concepts](readme/application-concepts.md)
* [Assets](readme/assets/README.md)
* [Creating Tokens](readme/assets/creating-tokens.md)
* [Denom Client (deprecated)](readme/assets/denom-client.md)
* [Injective Lists](readme/assets/injective-list.md)
* [Token Price](README.md)
* [Networks](readme/networks.md)
* [CosmJs Support](readme/getting-started-cosmjs.md)
* [Running examples](readme/running-examples.md)
* [Wallet](wallet/README.md)
* [Accounts](wallet/wallet-accounts.md)
* [Wallet Connections](wallet/wallet-connections.md)
* [Wallet Strategy](wallet/wallet-wallet-strategy.md)
* [Offchain (Arbitrary) Data](wallet/offchain-arbitrary-data.md)
* [Querying](querying/README.md)
* [Indexer](querying/querying-api/README.md)
* [Account](querying/querying-api/querying-indexer-account.md)
* [Auction](querying/querying-api/querying-indexer-auction.md)
* [Derivatives](querying/querying-api/querying-indexer-derivatives.md)
* [Explorer](querying/querying-api/querying-indexer-explorer.md)
* [Insurance Funds](querying/querying-api/querying-indexer-insurance-funds.md)
* [Markets](querying/querying-api/querying-indexer-markets.md)
* [Leaderboard](querying/querying-api/querying-indexer-leaderboard.md)
* [Mito](querying/querying-api/querying-indexer-mito.md)
* [Oracle](querying/querying-api/querying-indexer-oracle.md)
* [Portfolio](querying/querying-api/querying-indexer-portfolio.md)
* [Spot](querying/querying-api/querying-indexer-spot.md)
* [Web3Gw Transactions](querying/querying-api/querying-indexer-transaction.md)
* [Streaming](querying/querying-api/streaming/README.md)
* [Account](querying/querying-api/streaming/streaming-indexer-account.md)
* [Auction](querying/querying-api/streaming/streaming-indexer-auction.md)
* [Derivatives](querying/querying-api/streaming/streaming-indexer-derivatives.md)
* [Oracle](querying/querying-api/streaming/streaming-indexer-oracle.md)
* [Portfolio](querying/querying-api/streaming/streaming-indexer-portfolio.md)
* [Spot](querying/querying-api/streaming/streaming-indexer-spot.md)
* [Explorer](querying/querying-api/streaming/streaming-indexer-explorer.md)
* [Chain](querying/querying-chain/README.md)
* [Auction](querying/querying-chain/querying-chain-auction-module.md)
* [Auth](querying/querying-chain/querying-chain-auth-module.md)
* [Bank](querying/querying-chain/querying-chain-bank-module.md)
* [Distribution](querying/querying-chain/querying-chain-distribution.md)
* [Exchange](querying/querying-chain/querying-chain-exchange.md)
* [Governance](querying/querying-chain/querying-chain-governance.md)
* [IBC](querying/querying-chain/querying-chain-ibc.md)
* [Mint](querying/querying-chain/querying-chain-mint.md)
* [Insurance Funds](querying/querying-chain/querying-chain-insurance-funds.md)
* [Oracle](querying/querying-chain/querying-chain-oracle.md)
* [Peggy](querying/querying-chain/querying-chain-peggy.md)
* [Staking](querying/querying-chain/querying-chain-staking.md)
* [Tendermint](querying/querying-chain/querying-chain-tendermint.md)
* [Wasm](querying/querying-chain/querying-chain-wasm.md)
* [WasmX](querying/querying-chain/querying-chain-wasmx.md)
* [Token Factory](querying/querying-chain/token-factory.md)
* [Ethereum (GraphQL)](querying/querying-ethereum.md)
* [Transactions](transactions/README.md)
* [Cosmos](transactions/transactions-cosmos/README.md)
* [Ledger through Keplr Wallet](transactions/transactions-cosmos/ledger-through-keplr-wallet.md)
* [Ethereum](transactions/ethereum.md)
* [Ethereum Ledger](transactions/ethereum-ledger.md)
* [MsgBroadcaster](transactions/msgbroadcaster.md)
* [Private Key](transactions/private-key.md)
* [Web3 Gateway](transactions/web3-gateway.md)
* [Core Modules](core-modules/README.md)
* [Auction](core-modules/auction.md)
* [AuthZ](core-modules/authz.md)
* [Bank](core-modules/bank.md)
* [Distribution](core-modules/distribution.md)
* [Exchange](core-modules/exchange.md)
* [Feegrant](core-modules/feegrant.md)
* [Governance](core-modules/governance.md)
* [IBC](core-modules/ibc.md)
* [Insurance](core-modules/insurance.md)
* [Peggy](core-modules/peggy.md)
* [Staking](core-modules/staking.md)
* [Tokenfactory](core-modules/token-factory.md)
* [Wasm](core-modules/wasm.md)
* [Bridge](bridge/README.md)
* [Ethereum](bridge/ethereum.md)
* [IBC](bridge/ibc.md)
* [Wormhole](bridge/wormhole.md)
* [Contracts](contracts/README.md)
* [Injective Name Service](contracts/injective-name-service.md)
* [Building dApps](building-dapps/README.md)
* [Configuring Nuxt](building-dapps/configuring-nuxt.md)
* [Configuring React](building-dapps/configuring-react.md)
* [dApps Examples](building-dapps/dapps-examples/README.md)
* [Smart Contract](building-dapps/smart-contract.md)
* [DEX](building-dapps/dex.md)
* [Bridge](building-dapps/bridge.md)
* [Calculations](calculations/README.md)
* [Min Price Tick Size](calculations/min-price-tick-size.md)
* [Min Quantity Tick Size](calculations/min-quantity-tick-size.md)
14 changes: 7 additions & 7 deletions .gitbook/core-modules/token-factory.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Token Factory
# Tokenfactory

## Token Factory

Expand Down Expand Up @@ -141,12 +141,12 @@ const denomUnitsIfTokenHas6Decimals = [
{
denom: denom, /** we use the whole denom here */
exponent: 0,
aliases: [`micro${subdenom}`]
aliases: [subdenom]
},
{
denom: subdenom,
exponent: 6, /** we use the subdenom only here (if you want your token to have 6 decimals) */
aliases: [subdenom]
aliases: []
},
]

Expand Down Expand Up @@ -247,14 +247,14 @@ const msgSetDenomMetadata = MsgSetDenomMetadata.fromJSON({
uri: '' /** the logo of your token, should be hosted on IPFS and should be a small webp image */
denomUnits: [
{
denom: `factory/${injectiveAddress}/u${subdenom}`, /** notice the u */
denom: denom,
exponent: 0,
aliases: [`micro${subdenom}`]
aliases: [subdenom]
},
{
denom: denom,
denom: subdenom,
exponent: 6, /** if you want your token to have 6 decimals */
aliases: [subdenom]
aliases: []
},
]
}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
uses: actions/checkout@v2 # Public action
with:
fetch-depth: 0 # Checkout all branches and tags
persist-credentials: false

- name: 'Use NodeJS 18' # Setup node using version 14
uses: actions/setup-node@v2 # Public action
Expand Down
8 changes: 8 additions & 0 deletions packages/exceptions/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.14.13](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/exceptions@1.14.13-beta.0...@injectivelabs/exceptions@1.14.13) (2024-07-02)

**Note:** Version bump only for package @injectivelabs/exceptions





## [1.14.12](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/exceptions@1.14.12-beta.0...@injectivelabs/exceptions@1.14.12) (2024-06-18)

**Note:** Version bump only for package @injectivelabs/exceptions
Expand Down
8 changes: 8 additions & 0 deletions packages/networks/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.14.13](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/networks@1.14.13-beta.0...@injectivelabs/networks@1.14.13) (2024-07-02)

**Note:** Version bump only for package @injectivelabs/networks





## [1.14.12](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/networks@1.14.12-beta.0...@injectivelabs/networks@1.14.12) (2024-06-18)

**Note:** Version bump only for package @injectivelabs/networks
Expand Down
11 changes: 11 additions & 0 deletions packages/sdk-ts/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.14.13](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/sdk-ts@1.14.13-beta.5...@injectivelabs/sdk-ts@1.14.13) (2024-07-02)


### Bug Fixes

* actual block time ([f31d2df](https://github.com/InjectiveLabs/injective-ts/commit/f31d2dfe8f03f66108793a05bdee8968ab723eda))





## [1.14.12](https://github.com/InjectiveLabs/injective-ts/compare/@injectivelabs/sdk-ts@1.14.12-beta.7...@injectivelabs/sdk-ts@1.14.12) (2024-06-18)

**Note:** Version bump only for package @injectivelabs/sdk-ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,9 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
() => this.client.BinaryOptionsMarkets(request),
)

return pagination
? IndexerGrpcDerivativeTransformer.binaryOptionsMarketResponseWithPaginationToBinaryOptionsMarket(
response,
)
: IndexerGrpcDerivativeTransformer.binaryOptionsMarketsResponseToBinaryOptionsMarkets(
response,
)
return IndexerGrpcDerivativeTransformer.binaryOptionsMarketResponseWithPaginationToBinaryOptionsMarket(
response,
)
} catch (e: unknown) {
if (e instanceof InjectiveDerivativeExchangeRpc.GrpcWebError) {
throw new GrpcUnaryRequestException(new Error(e.toString()), {
Expand Down Expand Up @@ -456,7 +452,7 @@ export class IndexerGrpcDerivativesApi extends BaseGrpcConsumer {
}

async fetchPositionsV2(params?: {
address?: string,
address?: string
marketId?: string
marketIds?: string[]
subaccountId?: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,13 @@ export class IndexerGrpcDerivativeTransformer {
IndexerGrpcDerivativeTransformer.grpcBinaryOptionsMarketsToBinaryOptionsMarkets(
markets,
),
pagination: grpcPagingToPaging(pagination),
pagination: {
to: pagination?.to || 0,
from: pagination?.from || 0,
total: parseInt(pagination?.total || '0', 10),
countBySubaccount: parseInt(pagination?.countBySubaccount || '0', 10),
next: pagination?.next || [],
},
}
}

Expand Down
Loading

0 comments on commit b813000

Please sign in to comment.