diff --git a/ecosystem-sdk/sdk-sample/app/connect-with-connectkit/page.tsx b/ecosystem-sdk/sdk-sample/app/connect-with-connectkit/page.tsx index 0588464..a1f0f26 100644 --- a/ecosystem-sdk/sdk-sample/app/connect-with-connectkit/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/connect-with-connectkit/page.tsx @@ -13,7 +13,7 @@ const queryClient = new QueryClient(); export default function ConnectWithWagmi() { ecosystemWalletInstance.getEthereumProvider({ - // @ts-ignore + chain: bscTestnet, policyId: process.env.NEXT_PUBLIC_POLICY_ID, }); diff --git a/ecosystem-sdk/sdk-sample/app/connect-with-eip1193/page.tsx b/ecosystem-sdk/sdk-sample/app/connect-with-eip1193/page.tsx index 02155cc..e85813a 100644 --- a/ecosystem-sdk/sdk-sample/app/connect-with-eip1193/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/connect-with-eip1193/page.tsx @@ -10,7 +10,6 @@ export default function ConnectWithEIP1193() { const [loading, setLoadingState] = useState(false); const ecosystemWalletProvider = ecosystemWalletInstance.getEthereumProvider({ - // @ts-ignore chain: bscTestnet, policyId: process.env.NEXT_PUBLIC_POLICY_ID, }); diff --git a/ecosystem-sdk/sdk-sample/app/connect-with-etherjs/page.tsx b/ecosystem-sdk/sdk-sample/app/connect-with-etherjs/page.tsx index 52134c9..5dee908 100644 --- a/ecosystem-sdk/sdk-sample/app/connect-with-etherjs/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/connect-with-etherjs/page.tsx @@ -11,7 +11,6 @@ export default function ConnectWithEtherJS() { const [loading, setLoadingState] = useState(false); const ecosystemWalletProvider = ecosystemWalletInstance.getEthereumProvider({ - // @ts-ignore chain: bscTestnet, policyId: process.env.NEXT_PUBLIC_POLICY_ID, }); diff --git a/ecosystem-sdk/sdk-sample/app/connect-with-rainbow/page.tsx b/ecosystem-sdk/sdk-sample/app/connect-with-rainbow/page.tsx index 6e1b87c..b8e3437 100644 --- a/ecosystem-sdk/sdk-sample/app/connect-with-rainbow/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/connect-with-rainbow/page.tsx @@ -14,7 +14,6 @@ const queryClient = new QueryClient(); export default function ConnectWithWagmi() { ecosystemWalletInstance.getEthereumProvider({ - // @ts-ignore chain: bscTestnet, policyId: process.env.NEXT_PUBLIC_POLICY_ID, }); diff --git a/ecosystem-sdk/sdk-sample/app/connect-with-wagmi/page.tsx b/ecosystem-sdk/sdk-sample/app/connect-with-wagmi/page.tsx index 4a03c86..eef71a3 100644 --- a/ecosystem-sdk/sdk-sample/app/connect-with-wagmi/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/connect-with-wagmi/page.tsx @@ -12,7 +12,6 @@ const queryClient = new QueryClient(); export default function ConnectWithWagmi() { ecosystemWalletInstance.getEthereumProvider({ - // @ts-ignore chain: bscTestnet, policyId: process.env.NEXT_PUBLIC_POLICY_ID, }); diff --git a/ecosystem-sdk/sdk-sample/app/page.tsx b/ecosystem-sdk/sdk-sample/app/page.tsx index bd32c12..198ad04 100644 --- a/ecosystem-sdk/sdk-sample/app/page.tsx +++ b/ecosystem-sdk/sdk-sample/app/page.tsx @@ -32,6 +32,12 @@ export default function Home() { > Connect with Rainbow + + Connect with ConnectKit + ); diff --git a/ecosystem-sdk/sdk-sample/package.json b/ecosystem-sdk/sdk-sample/package.json index a014e78..8014c0c 100644 --- a/ecosystem-sdk/sdk-sample/package.json +++ b/ecosystem-sdk/sdk-sample/package.json @@ -1,9 +1,9 @@ { "name": "@examples/wallets-connect-with-nextjs", - "version": "0.0.14", + "version": "0.0.15", "dependencies": { "@rainbow-me/rainbowkit": "^2.0.7", - "@rapidfire/id": "^0.0.4", + "@rapidfire/id": "^0.0.14", "@tanstack/react-query": "^5.51.11", "connectkit": "^1.8.2", "ethers": "^5.7.2", diff --git a/ecosystem-sdk/sdk-sample/yarn.lock b/ecosystem-sdk/sdk-sample/yarn.lock index 662ddac..157e291 100644 --- a/ecosystem-sdk/sdk-sample/yarn.lock +++ b/ecosystem-sdk/sdk-sample/yarn.lock @@ -1040,12 +1040,12 @@ resolved "https://registry.yarnpkg.com/@nolyfill/is-core-module/-/is-core-module-1.0.39.tgz#3dc35ba0f1e66b403c00b39344f870298ebb1c8e" integrity sha512-nn5ozdjYQpUCZlWGuxcJY/KpxkWQs4DcbMCmKojjyrYDEAGy4Ce19NN4v5MduafTwJlbKc99UA8YhSVqq9yPZA== -"@openfort/ecosystem-js@latest": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@openfort/ecosystem-js/-/ecosystem-js-0.0.2.tgz#4f8189348ba348400130f96b9d9870569cbb1f68" - integrity sha512-9cEUmQ5K+S/HcnyJjT8mQhkIUDUHndlJ4I/3nW9A2QVAeqK5L2tATQtpw0Fpaenh9pBPKH3e2ZPsyVBeZHEgjg== +"@openfort/ecosystem-js@^0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@openfort/ecosystem-js/-/ecosystem-js-0.0.4.tgz#65c4ee0312a79bab117919105f3cb3342fe41f84" + integrity sha512-OB7MW8yPY4ujRg0+G972YU/l9rRujpOP4Tw9Ggkxs1IArKk6b+rpYBQREFbqFA7Qyl79fnxOddAV0+VnG3r5pQ== dependencies: - "@openfort/openfort-js" "0.8.8" + "@openfort/openfort-js" "0.8.11" "@stdlib/number-float64-base-normalize" "0.0.8" axios "^1.6.7" clsx "^2.1.1" @@ -1053,15 +1053,15 @@ es-cookie "~1.3.2" jwt-decode "^3.1.2" lucide-react "^0.414.0" - oidc-client-ts "2.2.1" + oidc-client-ts "3.1.0" styled-components "^6.1.13" uuid "^8.3.2" viem "^2.21.26" -"@openfort/openfort-js@0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@openfort/openfort-js/-/openfort-js-0.8.8.tgz#660bf05f9e888e59b2460467f9a101b60aa26703" - integrity sha512-Km7Q/uRanMz6JzfU9t4eRd5PSZQnttYYbPKJk0exoBK3T3ejELtGrIms4Lddp1eLJy1sjoFnNpmm6gCNWp8+xA== +"@openfort/openfort-js@0.8.11": + version "0.8.11" + resolved "https://registry.yarnpkg.com/@openfort/openfort-js/-/openfort-js-0.8.11.tgz#df117e4a9e852030ec83601cceb489c0c548269a" + integrity sha512-tF/5CUdHQrTmgyKsiu+2oUgaHISTuMRoeifnapIJrpSn1PJYXJQySsbcXKrjK2mOx82k5JajkekZHBsoKXwYDw== dependencies: "@ethersproject/abstract-signer" "^5.7.0" "@ethersproject/bytes" "^5.7.0" @@ -1203,12 +1203,12 @@ react-remove-scroll "2.6.0" ua-parser-js "^1.0.37" -"@rapidfire/id@^0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@rapidfire/id/-/id-0.0.4.tgz#7cc8faa45c5aebac653d7db9de0bad491ad88891" - integrity sha512-zpmZMipn7NYM4LY1rK+gDs9NDZ6998umUYeGupGCdi5loLGCnCgg/0ZqL3zBg7zvtAu59Zd0+Rk9GTRD7z2qMw== +"@rapidfire/id@^0.0.14": + version "0.0.14" + resolved "https://registry.yarnpkg.com/@rapidfire/id/-/id-0.0.14.tgz#ed600002f70d2974093d1040e6c30bae069695e3" + integrity sha512-jFi7RCnTVIwx5zZl7Vv08AWKsEEzImEf45mhU0Bc8qjQ9h0fTaScoaGJReVaj89PA8c9uQB/G6TDGqEpaPMQXA== dependencies: - "@openfort/ecosystem-js" latest + "@openfort/ecosystem-js" "^0.0.4" "@rtsao/scc@^1.1.0": version "1.1.0" @@ -3326,7 +3326,7 @@ crypto-browserify@^3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^4.1.1, crypto-js@^4.2.0: +crypto-js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== @@ -5099,6 +5099,11 @@ jwt-decode@^3.1.2: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== +jwt-decode@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b" + integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA== + keccak@^3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" @@ -5606,13 +5611,12 @@ ohash@^1.1.4: resolved "https://registry.yarnpkg.com/ohash/-/ohash-1.1.4.tgz#ae8d83014ab81157d2c285abf7792e2995fadd72" integrity sha512-FlDryZAahJmEF3VR3w1KogSEdWX3WhA5GPakFx4J81kEAiHyLMpdLLElS8n8dfNadMgAne/MywcvmogzscVt4g== -oidc-client-ts@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.2.1.tgz#aa397119db54952acd08efe04bac4eff9a9169db" - integrity sha512-g/W+DsUVeHZ8A7xUSTeK4bI6BNs9ROtMiiOOo+0M6IiTHxueJ757GD8e/8nPBL+k/o6bkfM5mWg4cZcSI8Iosw== +oidc-client-ts@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.1.0.tgz#28d3254951a1c64cc9780042c61492a71b2240dd" + integrity sha512-IDopEXjiwjkmJLYZo6BTlvwOtnlSniWZkKZoXforC/oLZHC9wkIxd25Kwtmo5yKFMMVcsp3JY6bhcNJqdYk8+g== dependencies: - crypto-js "^4.1.1" - jwt-decode "^3.1.2" + jwt-decode "^4.0.0" on-exit-leak-free@^0.2.0: version "0.2.0" diff --git a/ecosystem-sdk/sdk/package.json b/ecosystem-sdk/sdk/package.json index 555d6e2..db8e032 100644 --- a/ecosystem-sdk/sdk/package.json +++ b/ecosystem-sdk/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@rapidfire/id", - "version": "0.0.14", + "version": "0.0.15", "main": "dist/index.js", "module": "dist/index.mjs", "types": "dist/index.d.ts", diff --git a/ecosystem-wallet/README.md b/ecosystem-wallet/README.md index 8812297..7efd1fc 100644 --- a/ecosystem-wallet/README.md +++ b/ecosystem-wallet/README.md @@ -37,6 +37,8 @@ Key features: REACT_APP_APP_NAME= REACT_APP_OPENFORT_PUBLIC_KEY= REACT_APP_SHIELD_PUBLIC_KEY= +REACT_APP_BACKEND_URL= +REACT_APP_OPENFORT_ECOSYSTEM_ID= ``` #### Backend diff --git a/ecosystem-wallet/backend/package.json b/ecosystem-wallet/backend/package.json index 7493e06..1769197 100644 --- a/ecosystem-wallet/backend/package.json +++ b/ecosystem-wallet/backend/package.json @@ -1,6 +1,6 @@ { "name": "ecosystem-backend", - "version": "0.0.14", + "version": "0.0.15", "main": "index.js", "type": "commonjs", "scripts": { diff --git a/ecosystem-wallet/frontend/.env.example b/ecosystem-wallet/frontend/.env.example index fb08062..bc40c5e 100644 --- a/ecosystem-wallet/frontend/.env.example +++ b/ecosystem-wallet/frontend/.env.example @@ -1,4 +1,5 @@ REACT_APP_APP_NAME= REACT_APP_OPENFORT_PUBLIC_KEY= REACT_APP_SHIELD_PUBLIC_KEY= -REACT_APP_BACKEND_URL= \ No newline at end of file +REACT_APP_BACKEND_URL= +REACT_APP_OPENFORT_ECOSYSTEM_ID= \ No newline at end of file diff --git a/ecosystem-wallet/frontend/package.json b/ecosystem-wallet/frontend/package.json index 149b83a..7c884d5 100644 --- a/ecosystem-wallet/frontend/package.json +++ b/ecosystem-wallet/frontend/package.json @@ -1,9 +1,9 @@ { "name": "ecosystem-frontend", - "version": "0.0.14", + "version": "0.0.15", "private": true, "dependencies": { - "@openfort/ecosystem-js": "latest", + "@openfort/ecosystem-js": "0.0.4", "@types/node": "^16.7.13", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", diff --git a/ecosystem-wallet/frontend/src/App.tsx b/ecosystem-wallet/frontend/src/App.tsx index c10c938..0a1c1c2 100644 --- a/ecosystem-wallet/frontend/src/App.tsx +++ b/ecosystem-wallet/frontend/src/App.tsx @@ -66,6 +66,7 @@ function App() { defaultChain={polygonAmoy} onRedirectCallback={(appState?: AppState) => nav((appState && appState.returnTo) || window.location.pathname)} publishableKey={process.env.REACT_APP_OPENFORT_PUBLIC_KEY!} + ecosystemId={process.env.REACT_APP_OPENFORT_ECOSYSTEM_ID!} shieldConfig={{ shieldPublishableKey: process.env.REACT_APP_SHIELD_PUBLIC_KEY!, getShieldSession: getShieldSession diff --git a/ecosystem-wallet/frontend/yarn.lock b/ecosystem-wallet/frontend/yarn.lock index 00e4bb1..a37f554 100644 --- a/ecosystem-wallet/frontend/yarn.lock +++ b/ecosystem-wallet/frontend/yarn.lock @@ -1820,12 +1820,12 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@openfort/ecosystem-js@latest": - version "0.0.2" - resolved "https://registry.yarnpkg.com/@openfort/ecosystem-js/-/ecosystem-js-0.0.2.tgz#4f8189348ba348400130f96b9d9870569cbb1f68" - integrity sha512-9cEUmQ5K+S/HcnyJjT8mQhkIUDUHndlJ4I/3nW9A2QVAeqK5L2tATQtpw0Fpaenh9pBPKH3e2ZPsyVBeZHEgjg== +"@openfort/ecosystem-js@0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@openfort/ecosystem-js/-/ecosystem-js-0.0.4.tgz#65c4ee0312a79bab117919105f3cb3342fe41f84" + integrity sha512-OB7MW8yPY4ujRg0+G972YU/l9rRujpOP4Tw9Ggkxs1IArKk6b+rpYBQREFbqFA7Qyl79fnxOddAV0+VnG3r5pQ== dependencies: - "@openfort/openfort-js" "0.8.8" + "@openfort/openfort-js" "0.8.11" "@stdlib/number-float64-base-normalize" "0.0.8" axios "^1.6.7" clsx "^2.1.1" @@ -1833,15 +1833,15 @@ es-cookie "~1.3.2" jwt-decode "^3.1.2" lucide-react "^0.414.0" - oidc-client-ts "2.2.1" + oidc-client-ts "3.1.0" styled-components "^6.1.13" uuid "^8.3.2" viem "^2.21.26" -"@openfort/openfort-js@0.8.8": - version "0.8.8" - resolved "https://registry.yarnpkg.com/@openfort/openfort-js/-/openfort-js-0.8.8.tgz#660bf05f9e888e59b2460467f9a101b60aa26703" - integrity sha512-Km7Q/uRanMz6JzfU9t4eRd5PSZQnttYYbPKJk0exoBK3T3ejELtGrIms4Lddp1eLJy1sjoFnNpmm6gCNWp8+xA== +"@openfort/openfort-js@0.8.11": + version "0.8.11" + resolved "https://registry.yarnpkg.com/@openfort/openfort-js/-/openfort-js-0.8.11.tgz#df117e4a9e852030ec83601cceb489c0c548269a" + integrity sha512-tF/5CUdHQrTmgyKsiu+2oUgaHISTuMRoeifnapIJrpSn1PJYXJQySsbcXKrjK2mOx82k5JajkekZHBsoKXwYDw== dependencies: "@ethersproject/abstract-signer" "^5.7.0" "@ethersproject/bytes" "^5.7.0" @@ -4551,7 +4551,7 @@ crypto-browserify@^3.12.0: randombytes "^2.0.0" randomfill "^1.0.3" -crypto-js@^4.1.1, crypto-js@^4.2.0: +crypto-js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== @@ -7512,6 +7512,11 @@ jwt-decode@^3.1.2: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== +jwt-decode@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b" + integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA== + keyv@^4.5.3: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -8079,13 +8084,12 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -oidc-client-ts@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-2.2.1.tgz#aa397119db54952acd08efe04bac4eff9a9169db" - integrity sha512-g/W+DsUVeHZ8A7xUSTeK4bI6BNs9ROtMiiOOo+0M6IiTHxueJ757GD8e/8nPBL+k/o6bkfM5mWg4cZcSI8Iosw== +oidc-client-ts@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.1.0.tgz#28d3254951a1c64cc9780042c61492a71b2240dd" + integrity sha512-IDopEXjiwjkmJLYZo6BTlvwOtnlSniWZkKZoXforC/oLZHC9wkIxd25Kwtmo5yKFMMVcsp3JY6bhcNJqdYk8+g== dependencies: - crypto-js "^4.1.1" - jwt-decode "^3.1.2" + jwt-decode "^4.0.0" on-finished@2.4.1: version "2.4.1"