Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove deprecated testnets #1028

Merged
merged 1 commit into from
Oct 11, 2022
Merged

fix: remove deprecated testnets #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions __tests__/localAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDManager({
store: new DIDStore(dbConnection),
defaultProvider: 'did:ethr:rinkeby',
defaultProvider: 'did:ethr:goerli',
providers: {
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
Expand All @@ -167,14 +167,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
},
{
name: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
name: 'goerli',
rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
},
{
chainId: 421611,
name: 'arbitrum:rinkeby',
rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
chainId: 421613,
name: 'arbitrum:goerli',
rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
},
{
chainId: 1337,
Expand Down
14 changes: 7 additions & 7 deletions __tests__/localJsonStoreAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDManager({
store: new DIDStoreJson(jsonFileStore),
defaultProvider: 'did:ethr:rinkeby',
defaultProvider: 'did:ethr:goerli',
providers: {
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
Expand All @@ -140,14 +140,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
},
{
name: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
name: 'goerli',
rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
},
{
chainId: 421611,
name: 'arbitrum:rinkeby',
rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
chainId: 421613,
name: 'arbitrum:goerli',
rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
},
],
}),
Expand Down
14 changes: 7 additions & 7 deletions __tests__/localMemoryStoreAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDManager({
store: new MemoryDIDStore(),
defaultProvider: 'did:ethr:rinkeby',
defaultProvider: 'did:ethr:goerli',
providers: {
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
Expand All @@ -138,14 +138,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
},
{
name: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
name: 'goerli',
rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
},
{
chainId: 421611,
name: 'arbitrum:rinkeby',
rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
chainId: 421613,
name: 'arbitrum:goerli',
rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
},
],
}),
Expand Down
14 changes: 7 additions & 7 deletions __tests__/restAgent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
}),
new DIDManager({
store: new DIDStore(dbConnection),
defaultProvider: 'did:ethr:rinkeby',
defaultProvider: 'did:ethr:goerli',
providers: {
'did:ethr': new EthrDIDProvider({
defaultKms: 'local',
Expand All @@ -166,14 +166,14 @@ const setup = async (options?: IAgentOptions): Promise<boolean> => {
rpcUrl: 'https://mainnet.infura.io/v3/' + infuraProjectId,
},
{
name: 'rinkeby',
rpcUrl: 'https://rinkeby.infura.io/v3/' + infuraProjectId,
name: 'goerli',
rpcUrl: 'https://goerli.infura.io/v3/' + infuraProjectId,
},
{
chainId: 421611,
name: 'arbitrum:rinkeby',
rpcUrl: 'https://arbitrum-rinkeby.infura.io/v3/' + infuraProjectId,
registry: '0x8f54f62CA28D481c3C30b1914b52ef935C1dF820',
chainId: 421613,
name: 'arbitrum:goerli',
rpcUrl: 'https://arbitrum-goerli.infura.io/v3/' + infuraProjectId,
registry: '0x8FFfcD6a85D29E9C33517aaf60b16FE4548f517E',
},
],
}),
Expand Down
40 changes: 20 additions & 20 deletions __tests__/shared/didManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,29 +33,29 @@ export default (testContext: {
expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
})

it('should create identifier using did:ethr:arbitrum:rinkeby provider', async () => {
it('should create identifier using did:ethr:arbitrum:goerli provider', async () => {
identifier = await agent.didManagerCreate({
// this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:rinkeby` network specifier
provider: 'did:ethr:arbitrum:rinkeby',
// this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
provider: 'did:ethr:arbitrum:goerli',
})
expect(identifier.provider).toEqual('did:ethr:arbitrum:rinkeby')
expect(identifier.did).toMatch(/^did:ethr:arbitrum:rinkeby:0x.*$/)
expect(identifier.provider).toEqual('did:ethr:arbitrum:goerli')
expect(identifier.did).toMatch(/^did:ethr:arbitrum:goerli:0x.*$/)
expect(identifier.keys.length).toEqual(1)
expect(identifier.services.length).toEqual(0)
expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
})

it('should create identifier using chainId 421611', async () => {
it('should create identifier using chainId 3', async () => {
identifier = await agent.didManagerCreate({
provider: 'did:ethr',
options: {
// this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:rinkeby` network specifier
// this expects the `did:ethr` provider to matchPrefix and use the `arbitrum:goerli` network specifier
// because the configured network has that name
network: 421611,
network: 421613,
},
})
expect(identifier.provider).toEqual('did:ethr')
expect(identifier.did).toMatch(/^did:ethr:arbitrum:rinkeby:0x.*$/)
expect(identifier.did).toMatch(/^did:ethr:arbitrum:goerli:0x.*$/)
expect(identifier.keys.length).toEqual(1)
expect(identifier.services.length).toEqual(0)
expect(identifier.controllerKeyId).toEqual(identifier.keys[0].kid)
Expand Down Expand Up @@ -88,12 +88,12 @@ export default (testContext: {
it('should get or create identifier', async () => {
const identifier3 = await agent.didManagerGetOrCreate({
alias: 'alice',
provider: 'did:ethr:rinkeby',
provider: 'did:ethr:goerli',
})

const identifier4 = await agent.didManagerGetOrCreate({
alias: 'alice',
provider: 'did:ethr:rinkeby',
provider: 'did:ethr:goerli',
})

expect(identifier3).toEqual(identifier4)
Expand Down Expand Up @@ -126,7 +126,7 @@ export default (testContext: {

const identifier7 = await agent.didManagerGetByAlias({
alias: 'alice',
// default provider is 'did:ethr:rinkeby'
// default provider is 'did:ethr:goerli'
})

expect(identifier7).toEqual(identifier4)
Expand All @@ -141,18 +141,18 @@ export default (testContext: {
})
expect(aliceIdentifiers.length).toEqual(2)

const rinkebyIdentifiers = await agent.didManagerFind({
provider: 'did:ethr:rinkeby',
const goerliIdentifiers = await agent.didManagerFind({
provider: 'did:ethr:goerli',
})
expect(rinkebyIdentifiers.length).toBeGreaterThanOrEqual(1)
expect(goerliIdentifiers.length).toBeGreaterThanOrEqual(1)

// Default provider 'did:ethr:rinkeby'
await agent.didManagerCreate({ provider: 'did:ethr:rinkeby' })
// Default provider 'did:ethr:goerli'
await agent.didManagerCreate({ provider: 'did:ethr:goerli' })

const rinkebyIdentifiers2 = await agent.didManagerFind({
provider: 'did:ethr:rinkeby',
const goerliIdentifiers2 = await agent.didManagerFind({
provider: 'did:ethr:goerli',
})
expect(rinkebyIdentifiers2.length).toEqual(rinkebyIdentifiers.length + 1)
expect(goerliIdentifiers2.length).toEqual(goerliIdentifiers.length + 1)
})

it('should delete identifier', async () => {
Expand Down
30 changes: 15 additions & 15 deletions __tests__/shared/documentationExamples.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,48 +39,48 @@ export default (testContext: {
//DO NOT EDIT MANUALLY START

it('core-IResolver-getDIDComponentById example', async () => {
const did = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const did = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const didFragment = `${did}#controller`
const fragment = await agent.getDIDComponentById({
didDocument: (await agent.resolveDid({ didUrl: did }))?.didDocument,
didUrl: didFragment,
section: 'authentication',
})
expect(fragment).toEqual({
id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
type: 'EcdsaSecp256k1RecoveryMethod2020',
controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
})
})

it('core-IResolver-resolveDid example', async () => {
const doc = await agent.resolveDid({
didUrl: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
didUrl: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
})
expect(doc.didDocument).toEqual({
'@context': [
'https://www.w3.org/ns/did/v1',
'https://w3id.org/security/suites/secp256k1recovery-2020/v2',
],
id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
verificationMethod: [
{
id: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
id: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller',
type: 'EcdsaSecp256k1RecoveryMethod2020',
controller: 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
blockchainAccountId: 'eip155:4:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
controller: 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190',
blockchainAccountId: 'eip155:5:0xb09B66026bA5909A7CFE99b76875431D2b8D5190',
},
],
authentication: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
assertionMethod: ['did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
authentication: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
assertionMethod: ['did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190#controller'],
})
})

it('core-IDIDManager-didManagerCreate example', async () => {
const identifier = await agent.didManagerCreate({
alias: 'charlie',
provider: 'did:ethr:rinkeby',
provider: 'did:ethr:goerli',
kms: 'local',
})
})
Expand All @@ -90,15 +90,15 @@ export default (testContext: {
alias: 'alice',
})

const rinkebyIdentifiers = await agent.didManagerFind({
provider: 'did:ethr:rinkeby',
const goerliIdentifiers = await agent.didManagerFind({
provider: 'did:ethr:goerli',
})
})

it('core-IDIDManager-didManagerGetByAlias example', async () => {
const identifier = await agent.didManagerGetByAlias({
alias: 'charlie',
provider: 'did:ethr:rinkeby',
provider: 'did:ethr:goerli',
})
})

Expand Down
9 changes: 7 additions & 2 deletions __tests__/shared/messageHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default (testContext: {

it('should parse raw message', async () => {
const raw =
'eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1ODg2NzY3MzksInZwIjp7IkBjb250ZXh0IjpbImh0dHBzOi8vd3d3LnczLm9yZy8yMDE4L2NyZWRlbnRpYWxzL3YxIl0sInR5cGUiOlsiVmVyaWZpYWJsZVByZXNlbnRhdGlvbiJdLCJ2ZXJpZmlhYmxlQ3JlZGVudGlhbCI6WyJleUowZVhBaU9pSktWMVFpTENKaGJHY2lPaUpGVXpJMU5rc3RVaUo5LmV5SnBZWFFpT2pFMU9ESTJNVGsyTnpZc0luTjFZaUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJaXdpZG1NaU9uc2lRR052Ym5SbGVIUWlPbHNpYUhSMGNITTZMeTkzZDNjdWR6TXViM0puTHpJd01UZ3ZZM0psWkdWdWRHbGhiSE12ZGpFaVhTd2lkSGx3WlNJNld5SldaWEpwWm1saFlteGxRM0psWkdWdWRHbGhiQ0pkTENKamNtVmtaVzUwYVdGc1UzVmlhbVZqZENJNmV5SnVZVzFsSWpvaVFXeHBZMlVpZlgwc0ltbHpjeUk2SW1ScFpEcGxkR2h5T25KcGJtdGxZbms2TUhnell6TTFOMkpoTkRVNE9UTXpZVEU1WXpGa1pqRmpOMlkyWWpRM00ySXpNekF5WW1KaVpUWXhJbjAuSUdGMUxGT2M0X1BjR1ZlcTdZdzdPR3o0R2o3eFhaSzZwOGJQOUNTRUlYejdtTkZQTTB2MG51ZXZUWjQ3YTBJOFhnTGZDRk5rVXJJSXNjakg4TUZ4X3dFIl19LCJ0YWciOiJ0YWcxMjMiLCJhdWQiOlsiZGlkOmV4YW1wbGU6MzQ1NiIsImRpZDp3ZWI6dXBvcnQubWUiXSwiaXNzIjoiZGlkOmV0aHI6cmlua2VieToweGIwOWI2NjAyNmJhNTkwOWE3Y2ZlOTliNzY4NzU0MzFkMmI4ZDUxOTAifQ.4SWpp8siCBHP47KrOT_28IJIQPZLCWO9VS0Ir-VVYOGUAVj7vHtXLxl3Y6lLAxYeNqWrRPCAVkDArBFCNRjYUgA'
'eyJhbGciOiJFUzI1NksiLCJ0eXAiOiJKV1QifQ.eyJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vdmVyYW1vLmlvL2NvbnRleHRzL3Byb2ZpbGUvdjEiXSwidHlwZSI6WyJWZXJpZmlhYmxlQ3JlZGVudGlhbCJdLCJjcmVkZW50aWFsU3ViamVjdCI6eyJ5b3UiOiJSb2NrIn19LCJzdWIiOiJkaWQ6d2ViOmV4YW1wbGUuY29tIiwibmJmIjoxNjY1NDQ2NTgxLCJpc3MiOiJkaWQ6ZXRocjpnb2VybGk6MHgwMmExNDYzZDIyMDVjN2NkN2ZiMjkzY2RlNGQ5ZTM2YWRjYTk5MGY3ZWZhOTBiOTVlNTRmNTBkZjBhMTZjMTc0MjIifQ.cOUOSic-8YGQfUGPmHjj5HDS09LXGj9nEe6UOsbYRbl-VZMoLBNHcFgp2B-ZWNhe202B-pbCK51xM3viO3OfZA'
parsedMessage = await agent.handleMessage({
raw,
save: false,
Expand All @@ -39,7 +39,12 @@ export default (testContext: {

it('should get message from db', async () => {
const message = await agent.dataStoreGetMessage({ id: parsedMessage.id })
expect(message).toEqual(parsedMessage)
// message has empty `presentations` array (not present in `parsedMessage`), when
// using db (not json store)
// expect(message).toEqual(parsedMessage)
expect(message.raw).toEqual(parsedMessage.raw)
expect(message.data).toEqual(parsedMessage.data)
expect(message.metaData).toEqual(parsedMessage.metaData)
})

it('should throw error for non existing message', async () => {
Expand Down
2 changes: 1 addition & 1 deletion __tests__/shared/resolveDid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default (testContext: {
afterAll(testContext.tearDown)

it('should resolve didUrl', async () => {
const didUrl = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const didUrl = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const didDoc = (await agent.resolveDid({ didUrl })).didDocument
expect(didDoc?.id).toEqual(didUrl)
})
Expand Down
10 changes: 5 additions & 5 deletions __tests__/shared/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,21 @@ export default (testContext: {
afterAll(testContext.tearDown)

it('should get chainId for ethr did', async () => {
const didUrl = 'did:ethr:rinkeby:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const didUrl = 'did:ethr:goerli:0xb09b66026ba5909a7cfe99b76875431d2b8d5190'
const didDoc = await resolveDidOrThrow(didUrl, { agent })
if (didDoc.verificationMethod) {
const chainId = getChainIdForDidEthr(didDoc.verificationMethod[0])
expect(chainId).toEqual(4)
expect(chainId).toEqual(5)
}
})

it('should map identifier keys to did doc', async () => {
const account = `0xb09b66026ba5909a7cfe99b76875431d2b8d5190`
const did = `did:ethr:0x4:${account}`
const did = `did:ethr:0x5:${account}`
const controllerKeyId = `metamask-${account}`
await agent.didManagerImport({
did,
provider: 'did:ethr:rinkeby',
provider: 'did:ethr:goerli',
controllerKeyId,
keys: [
{
Expand All @@ -56,7 +56,7 @@ export default (testContext: {
const identifier = await agent.didManagerGet({ did })
const extendedKeys = await mapIdentifierKeysToDoc(identifier, 'verificationMethod', { agent })
expect(extendedKeys[0].meta.verificationMethod?.blockchainAccountId?.toLocaleLowerCase()).toEqual(
`eip155:4:${account}`,
`eip155:5:${account}`,
)
})
})
Expand Down
6 changes: 3 additions & 3 deletions __tests__/shared/verifiableDataJWT.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ export default (testContext: {

describe('using testvectors', () => {
const importedDID = {
did: 'did:ethr:rinkeby:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
provider: 'did:ethr:rinkeby',
did: 'did:ethr:goerli:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
provider: 'did:ethr:goerli',
controllerKeyId:
'04155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c7037e2bd897812170c92a4c978d6a10481491a37299d74c4bd412a111a4ac875',
keys: [
Expand Down Expand Up @@ -291,7 +291,7 @@ export default (testContext: {
expect(comparableOutput).toEqual({
credentialSubject: { name: 'Alice', id: 'did:example:subject' },
issuer: {
id: 'did:ethr:rinkeby:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
id: 'did:ethr:goerli:0x03155ee0cbefeecd80de63a62b4ed8f0f97ac22a58f76a265903b9acab79bf018c',
},
type: ['VerifiableCredential', 'Example'],
'@context': ['https://www.w3.org/2018/credentials/v1'],
Expand Down
Loading