Skip to content

Commit

Permalink
chore: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@bangjelkoski
bangjelkoski committed Dec 7, 2024
2 parents 199c9e4 + 60a9524 commit 49c97a5
Show file tree
Hide file tree
Showing 17 changed files with 50 additions and 50 deletions.
10 changes: 5 additions & 5 deletions deprecated/packages/wallet-ts/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-ts",
"description": "A convenient way to use and interact with different types of wallets on Injective.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"author": {
"name": "InjectiveLabs",
Expand Down Expand Up @@ -81,11 +81,11 @@
"@cosmostation/extension-client": "^0.1.15",
"@ethereumjs/common": "^3.1.1",
"@ethereumjs/tx": "^4.1.1",
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/networks": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/networks": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/utils": "^1.14.33",
"@injectivelabs/utils": "^1.14.34-beta.0",
"@keplr-wallet/cosmos": "^0.12.71",
"@keplr-wallet/types": "^0.12.71",
"@ledgerhq/hw-app-cosmos": "^6.29.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/exceptions/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/exceptions",
"description": "List of exceptions that can be reused throughout Injective's projects.",
"version": "1.14.33",
"version": "1.14.34-beta.0",
"sideEffects": false,
"license": "Apache-2.0",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/networks/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/networks",
"description": "Endpoints, networks, etc. Can be reused throughout Injective's projects.",
"version": "1.14.33",
"version": "1.14.34-beta.0",
"sideEffects": false,
"type": "module",
"license": "Apache-2.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/sdk-ts/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/sdk-ts",
"description": "SDK in TypeScript for building Injective applications in a browser, node, and react native environment.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"license": "Apache-2.0",
"author": {
Expand Down Expand Up @@ -122,18 +122,18 @@
"@cosmjs/proto-signing": "^0.32.3",
"@cosmjs/stargate": "^0.32.3",
"@ethersproject/bytes": "^5.7.0",
"@injectivelabs/abacus-proto-ts": "1.13.0",
"@injectivelabs/core-proto-ts": "1.13.4",
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/grpc-web": "^0.0.1",
"@injectivelabs/grpc-web-node-http-transport": "^0.0.2",
"@injectivelabs/grpc-web-react-native-transport": "^0.0.2",
"@injectivelabs/indexer-proto-ts": "1.13.3",
"@injectivelabs/mito-proto-ts": "1.13.2",
"@injectivelabs/abacus-proto-ts": "1.13.0",
"@injectivelabs/networks": "^1.14.33",
"@injectivelabs/networks": "^1.14.34-beta.0",
"@injectivelabs/olp-proto-ts": "1.13.1",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/utils": "^1.14.33",
"@injectivelabs/utils": "^1.14.34-beta.0",
"@metamask/eth-sig-util": "^4.0.0",
"@noble/curves": "^1.7.0",
"axios": "^1.6.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/utils/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/utils",
"description": "List of utils and helper functions that can be reused throughout Injective's projects.",
"version": "1.14.33",
"version": "1.14.34-beta.0",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-base/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-base",
"description": "Base wallet strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
8 changes: 4 additions & 4 deletions packages/wallets/wallet-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-core",
"description": "Core wallet strategy",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down Expand Up @@ -56,9 +56,9 @@
"start": "node dist/index.js"
},
"dependencies": {
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/networks": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/networks": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/utils": "^1.14.33",
"@injectivelabs/wallet-base": "^1.14.34-beta.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-cosmos-strategy/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-cosmos-strategy",
"description": "Wallet Cosmos Strategy with instantiated wallets",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-cosmos/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-cosmos",
"description": "Cosmos wallet strategies for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
6 changes: 3 additions & 3 deletions packages/wallets/wallet-cosmostation/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-cosmostation",
"description": "Cosmostation strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down Expand Up @@ -58,8 +58,8 @@
"dependencies": {
"@cosmjs/proto-signing": "^0.32.3",
"@cosmostation/extension-client": "^0.1.15",
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/wallet-base": "^1.14.34-beta.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-evm/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-evm",
"description": "EVM wallet strategies for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-ledger/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-ledger",
"description": "Ledger wallet strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
10 changes: 5 additions & 5 deletions packages/wallets/wallet-magic/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-magic",
"description": "Magic wallet strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down Expand Up @@ -56,11 +56,11 @@
"start": "node dist/index.js"
},
"dependencies": {
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/utils": "^1.14.33",
"@injectivelabs/wallet-base": "^1.14.34-beta.4",
"@injectivelabs/utils": "^1.14.34-beta.0",
"@injectivelabs/wallet-base": "^1.14.34-beta.5",
"@magic-ext/cosmos": "23.9.1",
"@magic-ext/oauth2": "9.9.0",
"magic-sdk": "28.9.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/wallets/wallet-private-key/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-private-key",
"description": "Private key wallet strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down Expand Up @@ -56,8 +56,8 @@
"start": "node dist/index.js"
},
"dependencies": {
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/wallet-base": "^1.14.34-beta.4"
},
Expand Down
30 changes: 15 additions & 15 deletions packages/wallets/wallet-strategy/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-strategy",
"description": "Wallet strategy with instantiated wallets",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down Expand Up @@ -58,21 +58,21 @@
"dependencies": {
"@ethereumjs/common": "^3.1.1",
"@ethereumjs/tx": "^4.1.1",
"@injectivelabs/exceptions": "^1.14.33",
"@injectivelabs/networks": "^1.14.33",
"@injectivelabs/sdk-ts": "^1.14.34-beta.4",
"@injectivelabs/exceptions": "^1.14.34-beta.0",
"@injectivelabs/networks": "^1.14.34-beta.0",
"@injectivelabs/sdk-ts": "^1.14.34-beta.5",
"@injectivelabs/ts-types": "^1.14.33",
"@injectivelabs/utils": "^1.14.33",
"@injectivelabs/wallet-base": "^1.14.34-beta.4",
"@injectivelabs/wallet-core": "^1.14.34-beta.4",
"@injectivelabs/wallet-cosmos": "^1.14.34-beta.4",
"@injectivelabs/wallet-cosmostation": "^1.14.34-beta.4",
"@injectivelabs/wallet-evm": "^1.14.34-beta.4",
"@injectivelabs/wallet-ledger": "^1.14.34-beta.4",
"@injectivelabs/wallet-magic": "^1.14.34-beta.4",
"@injectivelabs/wallet-private-key": "^1.14.34-beta.4",
"@injectivelabs/wallet-trezor": "^1.14.34-beta.4",
"@injectivelabs/wallet-wallet-connect": "^1.14.34-beta.4",
"@injectivelabs/utils": "^1.14.34-beta.0",
"@injectivelabs/wallet-base": "^1.14.34-beta.5",
"@injectivelabs/wallet-core": "^1.14.34-beta.5",
"@injectivelabs/wallet-cosmos": "^1.14.34-beta.5",
"@injectivelabs/wallet-cosmostation": "^1.14.34-beta.5",
"@injectivelabs/wallet-evm": "^1.14.34-beta.5",
"@injectivelabs/wallet-ledger": "^1.14.34-beta.5",
"@injectivelabs/wallet-magic": "^1.14.34-beta.5",
"@injectivelabs/wallet-private-key": "^1.14.34-beta.5",
"@injectivelabs/wallet-trezor": "^1.14.34-beta.5",
"@injectivelabs/wallet-wallet-connect": "^1.14.34-beta.5",
"alchemy-sdk": "^3.4.7",
"eip1193-provider": "^1.0.1",
"eth-sig-util": "^3.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-trezor/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-trezor",
"description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion packages/wallets/wallet-wallet-connect/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@injectivelabs/wallet-wallet-connect",
"description": "Wallet connect strategy for use with @injectivelabs/wallet-core.",
"version": "1.14.34-beta.4",
"version": "1.14.34-beta.5",
"sideEffects": false,
"type": "module",
"author": {
Expand Down

0 comments on commit 49c97a5

Please sign in to comment.