From 878cb864d0bf834add3a4903b4591f4bdd4162f2 Mon Sep 17 00:00:00 2001 From: Nik <2661899+CodeSchwert@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:02:13 +1200 Subject: [PATCH] fix: workaround for elliptic import error (#1588) --- packages/x-client/package.json | 1 + packages/x-client/src/exportUtils.ts | 2 +- packages/x-client/src/utils/index.ts | 4 +-- sdk/package.json | 3 +- yarn.lock | 47 +++++++++++++++++++++++++--- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/packages/x-client/package.json b/packages/x-client/package.json index 9a5873894b..c9340e6e00 100644 --- a/packages/x-client/package.json +++ b/packages/x-client/package.json @@ -12,6 +12,7 @@ "@ethersproject/strings": "^5.7.0", "@ethersproject/wallet": "^5.7.0", "@imtbl/config": "0.0.0", + "@imtbl/core-sdk": "^2.7.0", "@imtbl/generated-clients": "0.0.0", "axios": "^1.6.5", "bn.js": "^5.2.1", diff --git a/packages/x-client/src/exportUtils.ts b/packages/x-client/src/exportUtils.ts index f82c4ee9ca..f50d5465b6 100644 --- a/packages/x-client/src/exportUtils.ts +++ b/packages/x-client/src/exportUtils.ts @@ -2,4 +2,4 @@ export { generateLegacyStarkPrivateKey, generateStarkPrivateKey, createStarkSigner, -} from './utils'; +} from '@imtbl/core-sdk'; diff --git a/packages/x-client/src/utils/index.ts b/packages/x-client/src/utils/index.ts index d3d802a898..3ef356d579 100644 --- a/packages/x-client/src/utils/index.ts +++ b/packages/x-client/src/utils/index.ts @@ -1,5 +1,5 @@ export * from './convertToSignableToken'; export * from './formatError'; export * from './crypto'; -export * from './stark/starkCurve'; -export * from './stark/starkSigner'; +// export * from './stark/starkCurve'; +// export * from './stark/starkSigner'; diff --git a/sdk/package.json b/sdk/package.json index 42e999a3d3..fb36c0ebd2 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -16,6 +16,7 @@ "@ethersproject/providers": "^5.7.2", "@ethersproject/strings": "^5.7.0", "@ethersproject/wallet": "^5.7.0", + "@imtbl/core-sdk": "^2.7.0", "@imtbl/react-analytics": "0.2.1-alpha", "@jest/globals": "^29.5.0", "@magic-ext/oidc": "4.2.0", @@ -86,7 +87,7 @@ "typescript": "^4.9.5" }, "engines": { - "node": ">=20.11.0" + "node": ">=20.9.0" }, "exports": { "./package.json": "./package.json", diff --git a/yarn.lock b/yarn.lock index 9c2bdb4f6b..b6934a1c9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2902,7 +2902,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.12, @ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.7.0": +"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.0.0, @ethersproject/abi@npm:^5.0.12, @ethersproject/abi@npm:^5.5.0, @ethersproject/abi@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/abi@npm:5.7.0" dependencies: @@ -2990,7 +2990,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0": +"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.0.0, @ethersproject/bytes@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/bytes@npm:5.7.0" dependencies: @@ -3129,7 +3129,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:^5.7.2": +"@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:^5.0.0, @ethersproject/providers@npm:^5.7.2": version: 5.7.2 resolution: "@ethersproject/providers@npm:5.7.2" dependencies: @@ -3575,6 +3575,24 @@ __metadata: languageName: unknown linkType: soft +"@imtbl/core-sdk@npm:^2.7.0": + version: 2.7.0 + resolution: "@imtbl/core-sdk@npm:2.7.0" + dependencies: + "@ethersproject/abi": ^5.0.0 + "@ethersproject/bytes": ^5.0.0 + "@ethersproject/providers": ^5.0.0 + axios: ^0.26.1 + bn.js: ^5.2.0 + elliptic: ^6.5.4 + enc-utils: ^3.0.0 + ethereumjs-wallet: ^1.0.2 + ethers: ^5.7.1 + hash.js: ^1.1.7 + checksum: ea9bed1eceda1563d9ba50db29935ad0b4131cce3f1bf8e50f6bad28f3f301969b399319e8d6417e7546098c77850aa70c316ea48ecbfa7d28e85a27a206f234 + languageName: node + linkType: hard + "@imtbl/cryptofiat@0.0.0, @imtbl/cryptofiat@workspace:packages/internal/cryptofiat": version: 0.0.0-use.local resolution: "@imtbl/cryptofiat@workspace:packages/internal/cryptofiat" @@ -3844,6 +3862,7 @@ __metadata: "@imtbl/checkout-sdk": 0.0.0 "@imtbl/checkout-widgets": 0.0.0 "@imtbl/config": 0.0.0 + "@imtbl/core-sdk": ^2.7.0 "@imtbl/cryptofiat": 0.0.0 "@imtbl/generated-clients": 0.0.0 "@imtbl/guardian": 0.0.0 @@ -3973,6 +3992,7 @@ __metadata: "@ethersproject/strings": ^5.7.0 "@ethersproject/wallet": ^5.7.0 "@imtbl/config": 0.0.0 + "@imtbl/core-sdk": ^2.7.0 "@imtbl/generated-clients": 0.0.0 "@rollup/plugin-typescript": ^11.0.0 "@swc/jest": ^0.2.24 @@ -11768,6 +11788,15 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.26.1": + version: 0.26.1 + resolution: "axios@npm:0.26.1" + dependencies: + follow-redirects: ^1.14.8 + checksum: d9eb58ff4bc0b36a04783fc9ff760e9245c829a5a1052ee7ca6013410d427036b1d10d04e7380c02f3508c5eaf3485b1ae67bd2adbfec3683704745c8d7a6e1a + languageName: node + linkType: hard + "axios@npm:^1.6.5": version: 1.6.5 resolution: "axios@npm:1.6.5" @@ -16038,7 +16067,7 @@ __metadata: languageName: node linkType: hard -"ethers@npm:^5.7.2": +"ethers@npm:^5.7.1, ethers@npm:^5.7.2": version: 5.7.2 resolution: "ethers@npm:5.7.2" dependencies: @@ -16651,6 +16680,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.14.8": + version: 1.15.6 + resolution: "follow-redirects@npm:1.15.6" + peerDependenciesMeta: + debug: + optional: true + checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5 + languageName: node + linkType: hard + "follow-redirects@npm:^1.15.4": version: 1.15.4 resolution: "follow-redirects@npm:1.15.4"