Skip to content

Commit

Permalink
feat: bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@eruizgar91
eruizgar91 committed May 2, 2024
1 parent bba52ed commit 5bc1dbc
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 46 deletions.
22 changes: 11 additions & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nevermined-io/sdk",
"version": "3.0.0-rc24",
"version": "3.0.0-rc25",
"description": "Javascript SDK for connecting with Nevermined Data Platform ",
"main": "./dist/node/sdk.js",
"typings": "./dist/node/sdk.d.ts",
Expand Down Expand Up @@ -50,12 +50,12 @@
},
"homepage": "https://github.com/nevermined-io/sdk-js#readme",
"dependencies": {
"@alchemy/aa-core": "3.6.1",
"@alchemy/aa-core": "3.11.1",
"@apollo/client": "^3.7.16",
"@turnkey/viem": "0.4.14",
"@turnkey/viem": "0.4.16",
"@zerodev/ecdsa-validator": "5.2.3",
"@zerodev/sdk": "5.2.7",
"@zerodev/session-key": "^5.2.2",
"@zerodev/sdk": "5.2.11",
"@zerodev/session-key": "^5.3.0",
"assert": "^2.0.0",
"cross-fetch": "^4.0.0",
"crypto-browserify": "^3.12.0",
Expand All @@ -69,22 +69,22 @@
"node-fetch": "^2.6.1",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.1",
"permissionless": "^0.1.20",
"permissionless": "^0.1.22",
"pluralize": "^8.0.0",
"save-file": "^2.3.1",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"url": "^0.11.0",
"uuid": "^9.0.1",
"viem": "^2.9.26",
"viem": "^2.9.31",
"whatwg-url": "^14.0.0"
},
"peerDependencies": {
"@zerodev/ecdsa-validator": "^5.2.3",
"@zerodev/sdk": "^5.2.7",
"@zerodev/session-key": "^5.2.2",
"permissionless": "^0.1.20",
"viem": "^2.9.26"
"@zerodev/sdk": "^5.2.11",
"@zerodev/session-key": "^5.3.0",
"permissionless": "^0.1.22",
"viem": "^2.9.31"
},
"devDependencies": {
"@ambire/signature-validator": "^1.3.1",
Expand Down
3 changes: 3 additions & 0 deletions src/keeper/contracts/ContractBase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ export abstract class ContractBase extends Instantiable {

const kernelClient = from.getKernelClient()
const data = encodeFunctionData({ abi: this.contract.abi, functionName: name, args })
// @ts-ignore
const txHash = await kernelClient.sendUserOperation({
userOperation: {
// @ts-ignore
callData: await kernelClient.account.encodeCallData({
to: this.address,
value: txparams.value || 0n,
Expand All @@ -208,6 +210,7 @@ export abstract class ContractBase extends Instantiable {
})
}

// @ts-ignore
const bundlerClient = kernelClient.extend(bundlerActions(ENTRYPOINT_ADDRESS_V06))
const txReceipt = await bundlerClient.waitForUserOperationReceipt({ hash: txHash })

Expand Down
25 changes: 21 additions & 4 deletions src/models/NvmAccount.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Account, LocalAccount, toHex } from 'viem'
import { Account, Chain, LocalAccount, Transport, toHex } from 'viem'
import { NvmAccountError } from '../errors/NeverminedErrors'
import { NvmAccountType } from '../types/AccountTypes'
import { parseAccount } from 'viem/utils'
Expand All @@ -13,7 +13,12 @@ export class NvmAccount {
public babyY?: string
public babySecret?: string
private accountSigner?: Account
private kernelClient?: KernelAccountClient<any>
private kernelClient?: KernelAccountClient<
'0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
Transport,
Chain,
any
>
private zeroDevSigner?: KernelSmartAccount<any> // ZeroDevAccountSigner<'ECDSA'> | SessionKeyProvider
public accountType: NvmAccountType = { signerType: 'local', isZeroDev: false }

Expand Down Expand Up @@ -49,7 +54,12 @@ export class NvmAccount {
* @returns The nevermined account
*/
static async fromZeroDevSigner(
kernelClient: KernelAccountClient<any, any, any, any>, // | ZeroDevAccountSigner<'ECDSA'> | SessionKeyProvider,
kernelClient: KernelAccountClient<
'0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
Transport,
Chain,
any
>, // | ZeroDevAccountSigner<'ECDSA'> | SessionKeyProvider,
): Promise<NvmAccount> {
const address = kernelClient.account.address
const account = new NvmAccount(address, { signerType: 'zerodev', isZeroDev: true })
Expand All @@ -58,7 +68,14 @@ export class NvmAccount {
return account
}

static fromZeroDevSessionKey(kernelClient: KernelAccountClient<any, any, any, any>) {
static fromZeroDevSessionKey(
kernelClient: KernelAccountClient<
'0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789',
Transport,
Chain,
any
>,
) {
const address = kernelClient.account.address
const account = new NvmAccount(address, { signerType: 'sessionKey', isZeroDev: true })
account.kernelClient = kernelClient
Expand Down
3 changes: 1 addition & 2 deletions tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@
"typeRoots": ["node_modules/@types"],
"paths": {
"@/": ["./src/"],
"permissionless/*": ["src/permissionless.d.ts"],
"@zerodev/sdk/*": ["src/permissionless.d.ts"]
"permissionless/*": ["src/permissionless.d.ts"]
}
},
"include": ["src/**/*"],
Expand Down
89 changes: 60 additions & 29 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069"
integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==

"@alchemy/aa-core@3.6.1":
version "3.6.1"
resolved "https://registry.yarnpkg.com/@alchemy/aa-core/-/aa-core-3.6.1.tgz#af718313276458910d06030ee0aa946168e442f9"
integrity sha512-WVDacDuXcuePTHQSlKZ0nZvRHNSB48iUhh7fVSqchiStjq7BybdGg35AZf8eg5vcepkwSHekNKCp5LxKwpFCQg==
"@alchemy/aa-core@3.11.1":
version "3.11.1"
resolved "https://registry.yarnpkg.com/@alchemy/aa-core/-/aa-core-3.11.1.tgz#6d0909a7321dfb1a78bcd0d881f729abbdae39b7"
integrity sha512-3lyGVyg0MI8w9OqP0USh6javGQ5af2knBozbzr4uE/IoOcuEtfCl0XsCGNLuvQJ908wSV79Aoomo4LCwy4Gc/g==
dependencies:
abitype "^0.8.3"
eventemitter3 "^5.0.1"
viem "^2.8.6"
viem "2.8.6"
zod "^3.22.4"

"@ambire/signature-validator@^1.3.1":
Expand Down Expand Up @@ -1813,13 +1813,44 @@
"@turnkey/webauthn-stamper" "0.5.0"
cross-fetch "^3.1.5"

"@turnkey/[email protected]":
version "0.4.14"
resolved "https://registry.yarnpkg.com/@turnkey/viem/-/viem-0.4.14.tgz#bbc60bd8ce478401e9e7900357de7edc792acd14"
integrity sha512-YMREwb7QBBuge8wxdpFGKAl48e4W/rX84XR1E5GsD5HnypNPnfMu/AI7Np0cbQBA6IRuwY9HWu3HbDPU9kicDg==
"@turnkey/[email protected]":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@turnkey/iframe-stamper/-/iframe-stamper-1.2.0.tgz#bba478e391a266833f1a5960b9f1df9de5934fb8"
integrity sha512-OXbCVVzypa0AXa6dcNpfu8Q0xY/sq2nGXwhesrUQmE7V5I5nYYHZE3sQv54lErToX6H6YyDR9Z1DuPzEUkYTjw==

"@turnkey/[email protected]":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@turnkey/sdk-browser/-/sdk-browser-0.1.0.tgz#8bab3f0600644025b8935d8e6e8c0e193d3a763b"
integrity sha512-afgn/pP/HQ4fMoVk7q/vPbNCAQKlEuIREX++tdovl1Wr8IXGuzXDz8sXm4R1T6RU/gl+KzsE9B1EfKpr6JoriQ==
dependencies:
"@turnkey/api-key-stamper" "0.4.0"
"@turnkey/http" "2.10.0"
"@turnkey/iframe-stamper" "1.2.0"
"@turnkey/webauthn-stamper" "0.5.0"
buffer "^6.0.3"
cross-fetch "^3.1.5"
elliptic "^6.5.5"

"@turnkey/[email protected]":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@turnkey/sdk-server/-/sdk-server-0.1.0.tgz#899d199e2382a2ea4a933d1f408d96bee83d18d1"
integrity sha512-INg+r1p955OsS33OkV+AEqkhIhP2QcB20bAhS+oVPskGjin93/02RvfniJvArU30arhYTKOgeHrUHWmI6lVuaw==
dependencies:
"@turnkey/api-key-stamper" "0.4.0"
"@turnkey/http" "2.10.0"
buffer "^6.0.3"
cross-fetch "^3.1.5"
elliptic "^6.5.5"

"@turnkey/[email protected]":
version "0.4.16"
resolved "https://registry.yarnpkg.com/@turnkey/viem/-/viem-0.4.16.tgz#21e0a3a885b1912be759cff33aaf8b87c962cd0d"
integrity sha512-ml/sq15ozx9nl1oyQPtxZqfgTB7HGQxpU0968NhweAG2J0COtZrbAIxbDEDNbHr879T2g1rAGaZl7jAr5PsxMQ==
dependencies:
"@turnkey/api-key-stamper" "0.4.0"
"@turnkey/http" "2.10.0"
"@turnkey/sdk-browser" "0.1.0"
"@turnkey/sdk-server" "0.1.0"
cross-fetch "^4.0.0"
typescript "^5.1"

Expand Down Expand Up @@ -2556,17 +2587,17 @@
resolved "https://registry.yarnpkg.com/@zerodev/ecdsa-validator/-/ecdsa-validator-5.2.3.tgz#19f55620c2254df53677662ce0715172675f28ed"
integrity sha512-zeJjYhOW5EWK6XnctPt3iVnrqmrHfb81p/fJKaY4yQnL2ZYPrH37ZgtY1z5COETPCDTm65+jPfc1Zn/dziyAXQ==

"@zerodev/[email protected].7":
version "5.2.7"
resolved "https://registry.yarnpkg.com/@zerodev/sdk/-/sdk-5.2.7.tgz#f342d9050f2c799e42a3d3a1efafb7275e0ae73d"
integrity sha512-sOD+QWzymfPxLk7s7oRjvT60NWU2QxEWFpLeJ+PMEE9zy4NkhsMJF8dMynBqJA5ML+t0zn5YHJSbEkyjO0321A==
"@zerodev/[email protected].11":
version "5.2.11"
resolved "https://registry.yarnpkg.com/@zerodev/sdk/-/sdk-5.2.11.tgz#56841b9416889f0fb1fd9beb461f6c6d6a6c802e"
integrity sha512-42wl3vW+CPQTghOnAlVAwEiT7Aa+cb89EztY5NCX03jGHj64D38ZIRytZkIu4pleGGFHL7B29af6RYzGJPO0NQ==
dependencies:
semver "^7.6.0"

"@zerodev/session-key@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@zerodev/session-key/-/session-key-5.2.2.tgz#170f4f7d1163a661acd32d6a179f0d6b45c376a6"
integrity sha512-jHUjoRdzdP6DH8qIsSICLDMD+FgvBwZFQQ1ipgG33oK8696pFI4qjphMBQGA3kEqVzL0syKiO7eIUV8FlwD1mQ==
"@zerodev/session-key@^5.3.0":
version "5.3.0"
resolved "https://registry.yarnpkg.com/@zerodev/session-key/-/session-key-5.3.0.tgz#d347134a359d06ec03f6bb8378345d5d2d3f4c22"
integrity sha512-HZAFuhUiiG2bx8fqBW1LujH7Rn8zdbraipOoFXh55tDTyA3GX6M4RgiqzZPRoHMYfCYImE6ETBj0a97PjsBRHQ==
dependencies:
merkletreejs "^0.3.11"

Expand Down Expand Up @@ -8943,10 +8974,10 @@ pbkdf2@^3.0.17, pbkdf2@^3.0.3, pbkdf2@^3.1.2:
safe-buffer "^5.0.1"
sha.js "^2.4.8"

permissionless@^0.1.20:
version "0.1.20"
resolved "https://registry.yarnpkg.com/permissionless/-/permissionless-0.1.20.tgz#c17407db215faab22e74a102fbca521e00787504"
integrity sha512-e+jHLOdDvOiHEAIKGPo1HCviTOnwxSkqFmfCQve7Zl1VbeFTBYWZF78fsZlhO5Gje1irfqsh+SCfbpPjFA4fcA==
permissionless@^0.1.22:
version "0.1.22"
resolved "https://registry.yarnpkg.com/permissionless/-/permissionless-0.1.22.tgz#9668b8719a6d819677fb479731a09fc15a99595a"
integrity sha512-C+1l3dkYKOicCilPXLbm5JfnLOKK+Efprg69SG+WRsNjuXHi4zSdQgex/7lF5hh4WvcaWRRMm1NCA523XlwCJw==

picocolors@^1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -11122,10 +11153,10 @@ vfile@^6.0.0, vfile@^6.0.1:
unist-util-stringify-position "^4.0.0"
vfile-message "^4.0.0"

viem@^2.8.6:
version "2.9.21"
resolved "https://registry.yarnpkg.com/viem/-/viem-2.9.21.tgz#a7dd3d4c827088e5336e5a6b35ec0283d2938595"
integrity sha512-8GtxPjPGpiN5cmr19zSX9mb1LX/eON3MPxxAd3QmyUFn69Rp566zlREOqE7zM35y5yX59fXwnz6O3X7e9+C9zg==
[email protected]:
version "2.8.6"
resolved "https://registry.yarnpkg.com/viem/-/viem-2.8.6.tgz#7467a0f113b4b13dd53fde4797aec1e686672f03"
integrity sha512-LqxLOSFtXfbC3tsiZ8Km8jKR4ktTOLfigL2dR9IN28He2+QrNhYvvwGPz3P4hbfU12Wvuxo6mWGZ2L1lpNtvrA==
dependencies:
"@adraffy/ens-normalize" "1.10.0"
"@noble/curves" "1.2.0"
Expand All @@ -11136,10 +11167,10 @@ viem@^2.8.6:
isows "1.0.3"
ws "8.13.0"

viem@^2.9.26:
version "2.9.26"
resolved "https://registry.yarnpkg.com/viem/-/viem-2.9.26.tgz#def3f0c1d12e966c812f2b7fd334d9f259d88032"
integrity sha512-WWYsZfxDsvVsbQF9v3i0M7A2TYTtQl+pwiF5UP8/5dr15XEMGB0MJDhH3esU7jJnBd/JMjkJH/DQRAKuqYS23Q==
viem@^2.9.31:
version "2.9.31"
resolved "https://registry.yarnpkg.com/viem/-/viem-2.9.31.tgz#cfe8e1bb81d358c9117e5e1144d26a95d8aab3dd"
integrity sha512-8aJ8Dm/591Czwb/nRayo0z8Ls5KxqC4QYE33fmHwhx2tDUWC/hHcPZqjLRSTWFtAfi0aZKvP7BeB6UZ3ZkTRhQ==
dependencies:
"@adraffy/ens-normalize" "1.10.0"
"@noble/curves" "1.2.0"
Expand Down

0 comments on commit 5bc1dbc

Please sign in to comment.