merged main, fixed conflicts

rarimo · Aug 9, 2023 · 097a740 · 097a740
2 parents a2363cf + c1a9305
commit 097a740
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,9 +9,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - `@rarimo/client` - Identity related query methods
 
+## [2.0.0-rc.15] - 2023-08-09
+### Fixed
+- `@rarimo/client` - `getProposal` return value
+
+## [2.0.0-rc.14] - 2023-08-09
+### Added
+- `@rarimo/client` - `Config` extended with `chainName` and `chainIconUrl` fields
+
 ## [2.0.0-rc.13] - 2023-08-04
 ### Changed
-- `@rarimo/zkp-gen-iden3` - generating inputs for `credentialAtomicQueryMTPV2`, `credentialAtomicQueryMTPV2OnChain`, `credentialAtomicQuerySigV2`, `credentialAtomicQuerySigV2OnChain` circuits
+- `@rarimo/zkp-gen-iden3` - generating inputs for `credentialAtomicQueryMTPV2`,
+`credentialAtomicQueryMTPV2OnChain`, `credentialAtomicQuerySigV2`,
+`credentialAtomicQuerySigV2OnChain` circuits
 
 ## [2.0.0-rc.12] - 2023-08-04
 ### Changed
@@ -405,7 +415,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Under the hood changes
 - Initiated repo with `@rarimo/provider` and `@rarimo/nft-checkout` packages
 
-[Unreleased]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.13...HEAD
+[Unreleased]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.15...HEAD
+[2.0.0-rc.15]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.14...2.0.0-rc.15
+[2.0.0-rc.14]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.13...2.0.0-rc.14
 [2.0.0-rc.13]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.12...2.0.0-rc.13
 [2.0.0-rc.12]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.11...2.0.0-rc.12
 [2.0.0-rc.11]: https://github.com/rarimo/js-sdk/compare/2.0.0-rc.10...2.0.0-rc.11

diff --git a/assets/logos/ra-dark-logo.png b/assets/logos/ra-dark-logo.png
diff --git a/assets/logos/ra-light-logo.png b/assets/logos/ra-light-logo.png
diff --git a/packages/auth-zkp-iden3/package.json b/packages/auth-zkp-iden3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/auth-zkp-iden3",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Tools that authenticate a zero-knowledge proof and provide verifiable credentials from it.",
   "repository": {
     "type": "git",

diff --git a/packages/bridge/package.json b/packages/bridge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/bridge",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Internal tools that other Rarimo packages use to bridge tokens.",
   "repository": {
     "type": "git",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/client",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "The Rarimo chain client",
   "repository": {
     "type": "git",

diff --git a/packages/client/src/helpers/chain-info.ts b/packages/client/src/helpers/chain-info.ts
@@ -19,7 +19,8 @@ export const getChainInfo = async (
 
   return {
     chainId,
-    chainName: chainId?.toUpperCase() + ' Network',
+    chainName: config.chainName,
+    chainSymbolImageUrl: config.chainIconUrl,
     rpc: config.rpcUrl,
     rest: config.apiUrl,
     stakeCurrency: currency,

diff --git a/packages/client/src/types/config.ts b/packages/client/src/types/config.ts
@@ -2,6 +2,8 @@ export type Config = {
   rpcUrl: string
   apiUrl: string
   prefix: string
+  chainName: string
+  chainIconUrl: string
   currency: {
     denom: string
     minDenom: string

diff --git a/packages/identity-gen-iden3/package.json b/packages/identity-gen-iden3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/identity-gen-iden3",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Tools that generate distributed identities for the Iden3 protocol.",
   "repository": {
     "type": "git",

diff --git a/packages/nft-checkout/package.json b/packages/nft-checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/nft-checkout",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Features of the Rarimo SDK that create cross-chain transactions based on the Rarimo protocol.",
   "repository": {
     "type": "git",

diff --git a/packages/provider/package.json b/packages/provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/provider",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "A common interface for access to wallets (EVM and non-EVM) in the Rarimo SDK, used by packages that provide access to wallets on specific chains such as @rarimo/providers-evm, @rarimo/providers-solana, and @rarimo/providers-near.",
   "repository": {
     "type": "git",

diff --git a/packages/providers-evm/package.json b/packages/providers-evm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/providers-evm",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Features of the Rarimo SDK that provide access to wallets and the ability to interact with them on EVM-compatible blockchains.",
   "repository": {
     "type": "git",

diff --git a/packages/providers-near/package.json b/packages/providers-near/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/providers-near",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Features of the Rarimo SDK that provide access to wallets and the ability to interact with them on the NEAR blockchain.",
   "repository": {
     "type": "git",

diff --git a/packages/providers-solana/package.json b/packages/providers-solana/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/providers-solana",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Features of the Rarimo SDK that provide access to wallets and the ability to interact with them on the Solana blockchain.",
   "repository": {
     "type": "git",

diff --git a/packages/react-nft-checkout/package.json b/packages/react-nft-checkout/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/react-nft-checkout",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "React components that you can use in your UI to create cross-chain transactions with the Rarimo protocol.",
   "license": "MIT",
   "repository": {

diff --git a/packages/react-provider/package.json b/packages/react-provider/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/react-provider",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Tools to connect to wallets in React applications through the Rarimo SDK.",
   "repository": {
     "type": "git",

diff --git a/packages/shared-zkp-iden3/package.json b/packages/shared-zkp-iden3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/shared-zkp-iden3",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Internal tools that other Rarimo packages use for identity functionality.",
   "repository": {
     "type": "git",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/shared",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Utility functions, types and constants shared across Rarimo packages.",
   "repository": {
     "type": "git",

diff --git a/packages/swap/package.json b/packages/swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/swap",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Internal tools that other Rarimo packages use to swap tokens.",
   "repository": {
     "type": "git",

diff --git a/packages/zkp-gen-iden3/package.json b/packages/zkp-gen-iden3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rarimo/zkp-gen-iden3",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.15",
   "description": "Tools that generate zero-knowledge proofs for the Iden3 protocol.",
   "repository": {
     "type": "git",