Skip to content

Commit

Permalink
fix(deps): bump ethers to v6 and veramo@5.5.3-next.17 (#180)
Browse files Browse the repository at this point in the history
* fix(deps): bump ethers to v6 and veramo@5.5.3-next.17

* fix: dependencies

* fix: ethr-did-provider settings

---------

Co-authored-by: Simonas Karuzas <simonas@not.cat>
  • Loading branch information
mirceanis and simonas-notcat authored Oct 9, 2023
1 parent d8cd6c9 commit 52d47db
Show file tree
Hide file tree
Showing 6 changed files with 556 additions and 492 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"build": "pnpm -r build",
"test": "pnpm -r test",
"upgrade-veramo:next": "pnpm -r upgrade-veramo:next",
"publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest",
"publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes"
},
Expand Down
60 changes: 30 additions & 30 deletions packages/agent-explore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"test": "craco test --watchAll=false",
"release": "semantic-release",
"agent-explore": "./bin/bin.js",
"upgrade-veramo": "pnpm add -D @veramo/core @veramo/core-types @veramo/did-discovery @veramo/credential-w3c @veramo/credential-ld @veramo/credential-eip712 @veramo/data-store @veramo/did-comm @veramo/did-jwt @veramo/did-resolver @veramo/message-handler @veramo/remote-client @veramo/selective-disclosure @veramo/credential-eip712 @veramo/data-store-json @veramo/did-manager @veramo/kms-web3 @veramo/key-manager @veramo/did-provider-ethr @veramo/utils @veramo/did-provider-peer @veramo/did-provider-key @veramo/did-provider-jwk @veramo/did-provider-pkh @veramo/kms-local",
"upgrade-veramo:next": "pnpm add -D @veramo/core@next @veramo/core-types@next @veramo/did-discovery@next @veramo/credential-w3c@next @veramo/credential-ld@next @veramo/credential-eip712@next @veramo/data-store@next @veramo/did-comm@next @veramo/did-jwt@next @veramo/did-resolver@next @veramo/message-handler@next @veramo/remote-client@next @veramo/selective-disclosure@next @veramo/credential-eip712@next @veramo/data-store-json@next @veramo/did-manager@next @veramo/kms-web3@next @veramo/key-manager@next @veramo/did-provider-ethr@next @veramo/utils@next @veramo/did-provider-peer@next @veramo/did-provider-key@next @veramo/did-provider-jwk@next @veramo/did-provider-pkh@next @veramo/kms-local@next",
"upgrade-veramo": "pnpm add -D @veramo/core @veramo/core-types @veramo/did-discovery @veramo/credential-w3c @veramo/credential-ld @veramo/credential-eip712 @veramo/data-store @veramo/did-comm @veramo/did-jwt @veramo/did-resolver @veramo/message-handler @veramo/remote-client @veramo/selective-disclosure @veramo/credential-eip712 @veramo/data-store-json @veramo/did-manager @veramo/kms-web3 @veramo/key-manager @veramo/did-provider-ethr @veramo/utils @veramo/did-provider-peer @veramo/did-provider-key @veramo/did-provider-jwk @veramo/did-provider-pkh @veramo/kms-local @veramo-community/veramo-react@latest",
"upgrade-veramo:next": "pnpm add -D @veramo/core@next @veramo/core-types@next @veramo/did-discovery@next @veramo/credential-w3c@next @veramo/credential-ld@next @veramo/credential-eip712@next @veramo/data-store@next @veramo/did-comm@next @veramo/did-jwt@next @veramo/did-resolver@next @veramo/message-handler@next @veramo/remote-client@next @veramo/selective-disclosure@next @veramo/credential-eip712@next @veramo/data-store-json@next @veramo/did-manager@next @veramo/kms-web3@next @veramo/key-manager@next @veramo/did-provider-ethr@next @veramo/utils@next @veramo/did-provider-peer@next @veramo/did-provider-key@next @veramo/did-provider-jwk@next @veramo/did-provider-pkh@next @veramo/kms-local@next @veramo-community/veramo-react@latest",
"build-electron": "cross-env PUBLIC_URL=./ craco build",
"electron": "electron .",
"electron-dev": "cross-env ELECTRON_START_URL=http://localhost:3000 electron .",
Expand Down Expand Up @@ -89,7 +89,6 @@
"@craco/craco": "^7.1.0",
"@dnd-kit/core": "^6.0.8",
"@dnd-kit/sortable": "^7.0.2",
"@ethersproject/providers": "^5.7.2",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.4.3",
Expand All @@ -104,32 +103,32 @@
"@types/uuid": "^9.0.1",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"@veramo-community/agent-explorer-plugin": "workspace:*",
"@veramo-community/veramo-react": "^1.2.0",
"@veramo/core": "5.5.2-next.11",
"@veramo/core-types": "5.5.2-next.11",
"@veramo/credential-eip712": "5.5.2-next.11",
"@veramo/credential-ld": "5.5.2-next.11",
"@veramo/credential-w3c": "5.5.2-next.11",
"@veramo/data-store": "5.5.2-next.11",
"@veramo/data-store-json": "5.5.2-next.11",
"@veramo/did-comm": "5.5.2-next.11",
"@veramo/did-discovery": "5.5.2-next.11",
"@veramo/did-jwt": "5.5.2-next.11",
"@veramo/did-manager": "5.5.2-next.11",
"@veramo/did-provider-ethr": "5.5.2-next.11",
"@veramo/did-provider-jwk": "5.5.2-next.11",
"@veramo/did-provider-key": "5.5.2-next.11",
"@veramo/did-provider-peer": "5.5.2-next.11",
"@veramo/did-provider-pkh": "5.5.2-next.11",
"@veramo/did-resolver": "5.5.2-next.11",
"@veramo/key-manager": "5.5.2-next.11",
"@veramo/kms-local": "5.5.2-next.11",
"@veramo/kms-web3": "5.5.2-next.11",
"@veramo/message-handler": "5.5.2-next.11",
"@veramo/remote-client": "5.5.2-next.11",
"@veramo/selective-disclosure": "5.5.2-next.11",
"@veramo/utils": "5.5.2-next.11",
"@veramo-community/agent-explorer-plugin": "workspace:^",
"@veramo-community/veramo-react": "1.3.0",
"@veramo/core": "5.5.3-next.17",
"@veramo/core-types": "5.5.3-next.17",
"@veramo/credential-eip712": "5.5.3-next.17",
"@veramo/credential-ld": "5.5.3-next.17",
"@veramo/credential-w3c": "5.5.3-next.17",
"@veramo/data-store": "5.5.3-next.17",
"@veramo/data-store-json": "5.5.3-next.17",
"@veramo/did-comm": "5.5.3-next.17",
"@veramo/did-discovery": "5.5.3-next.17",
"@veramo/did-jwt": "5.5.3-next.17",
"@veramo/did-manager": "5.5.3-next.17",
"@veramo/did-provider-ethr": "5.5.3-next.17",
"@veramo/did-provider-jwk": "5.5.3-next.17",
"@veramo/did-provider-key": "5.5.3-next.17",
"@veramo/did-provider-peer": "5.5.3-next.17",
"@veramo/did-provider-pkh": "5.5.3-next.17",
"@veramo/did-resolver": "5.5.3-next.17",
"@veramo/key-manager": "5.5.3-next.17",
"@veramo/kms-local": "5.5.3-next.17",
"@veramo/kms-web3": "5.5.3-next.17",
"@veramo/message-handler": "5.5.3-next.17",
"@veramo/remote-client": "5.5.3-next.17",
"@veramo/selective-disclosure": "5.5.3-next.17",
"@veramo/utils": "5.5.3-next.17",
"@web3modal/wagmi": "^3.0.2",
"@yudiel/react-qr-scanner": "^1.1.8",
"antd": "~5.8.4",
Expand All @@ -143,6 +142,7 @@
"electron": "26.2.2",
"electron-builder": "24.6.4",
"eslint": "^8.47.0",
"ethers": "^6.7.1",
"ethr-did-resolver": "^8.0.0",
"https-browserify": "^1.0.0",
"husky": "^8.0.3",
Expand All @@ -163,7 +163,7 @@
"stream": "npm:stream-browserify@^3.0.0",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"typescript": "4.9.5",
"typescript": "5.2.2",
"url": "^0.11.1",
"url-parse": "^1.5.10",
"uuid": "^9.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/agent-explore/src/context/web3/wagmi.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { arbitrum, mainnet, sepolia, goerli, optimism } from 'wagmi/chains'
import { WagmiConfig } from 'wagmi'
import React, { PropsWithChildren } from 'react'
import { type WalletClient, useWalletClient } from 'wagmi'
import { Web3Provider } from '@ethersproject/providers'
import { BrowserProvider } from 'ethers'

const projectId = '8923f80c7aefd6f580a1f1d630633ab5'

const metadata = {
name: 'Agent Explorer',
description: 'Explore data accross multiple DID agents',
description: 'Explore data across multiple DID agents',
url: window.location.protocol + '//' + window.location.hostname,
icons: ['https://explore.veramo.io/icon-192-maskable.png']
}
Expand All @@ -30,7 +30,7 @@ export function walletClientToProvider(walletClient: WalletClient) {
name: chain.name,
ensAddress: chain.contracts?.ensRegistry?.address,
}
const provider = new Web3Provider(transport, network)
const provider = new BrowserProvider(transport, network)
// const signer = provider.getSigner(account.address)
return provider
}
Expand Down
14 changes: 9 additions & 5 deletions packages/agent-explore/src/context/web3/web3Agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import {
CoordinateMediationRecipientMessageHandler,
PickupRecipientMessageHandler,
} from '@veramo/did-comm'
import { Web3Provider } from '@ethersproject/providers'
import { BrowserProvider } from 'ethers'
import { KeyManagementSystem } from '@veramo/kms-local'
import { SaveMessageHandler } from './saveMessageHandler'
import {
Expand Down Expand Up @@ -73,7 +73,7 @@ const identifierDataStore =
const infuraProjectId = '3586660d179141e3801c3895de1c2eba'

export interface ConnectorInfo {
provider: Web3Provider
provider: BrowserProvider
chainId: number
accounts: string[]
name: string
Expand All @@ -89,7 +89,7 @@ export async function createWeb3Agent({ connectors, }: {
'did:jwk': new JwkDIDProvider({ defaultKms: 'local' }),
// TODO: add ethr and pkh providers backed by kmsLocal here too?
}
const web3Providers: Record<string, Web3Provider> = {}
const web3Providers: Record<string, BrowserProvider> = {}

connectors.forEach((info) => {
didProviders[info.name + "-pkh"] = new PkhDIDProvider({
Expand All @@ -98,8 +98,12 @@ export async function createWeb3Agent({ connectors, }: {
})
didProviders[info.name + "-ethr"] = new EthrDIDProvider({
defaultKms: 'web3',
network: info.chainId,
web3Provider: info.provider
networks: [
{
chainId: '0x' + info.chainId,
provider: info.provider,
}
]
})
web3Providers[info.name] = info.provider
})
Expand Down
17 changes: 9 additions & 8 deletions packages/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"license": "Apache-2.0",
"scripts": {
"build": "tsc",
"watch": "tsc -w"
"watch": "tsc -w",
"upgrade-veramo:next": "pnpm add -D @veramo/core@next @veramo/core-types@next @veramo/data-store@next @veramo/utils@next @veramo-community/veramo-react@latest"
},
"files": [
"build",
Expand All @@ -30,11 +31,6 @@
"@ant-design/pro-components": "^2.6.13",
"@types/md5": "^2.3.2",
"@types/url-parse": "^1.4.8",
"@veramo-community/veramo-react": "^1.2.0",
"@veramo/core": "5.5.2-next.11",
"@veramo/core-types": "5.5.2-next.11",
"@veramo/data-store": "5.5.2-next.11",
"@veramo/utils": "5.5.2-next.11",
"antd": "~5.8.4",
"date-fns": "^2.30.0",
"did-jwt-vc": "^3.2.10",
Expand All @@ -45,14 +41,19 @@
"react-dom": "^18.2.0",
"react-query": "^3.39.3",
"react-router-dom": "^6.11.2",
"typescript": "4.9.5",
"typescript": "5.2.2",
"url-parse": "^1.5.10",
"uuid": "^9.0.1"
},
"devDependencies": {
"@types/markdown-it": "^13.0.2",
"@types/react": "^18.2.23",
"@types/react-dom": "^18.2.8",
"@types/uuid": "^9.0.4"
"@types/uuid": "^9.0.4",
"@veramo-community/veramo-react": "^1.3.0",
"@veramo/core": "5.5.3-next.17",
"@veramo/core-types": "5.5.3-next.17",
"@veramo/data-store": "5.5.3-next.17",
"@veramo/utils": "5.5.3-next.17"
}
}
Loading

0 comments on commit 52d47db

Please sign in to comment.