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

Caip multichain caip 27 api spec tests #27229

Merged
merged 10 commits into from
Sep 25, 2024
Merged

Caip multichain caip 27 api spec tests #27229

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
50de40c
fix: add initial api spec tests for caip-27
shanejonas Sep 17, 2024
14d0820
Update LavaMoat policies
metamaskbot Sep 17, 2024
21b8b9a
fix: bump api spec to fix examples + hardcode another example fix
shanejonas Sep 18, 2024
0f73a3b
fix: remove console.logs
shanejonas Sep 19, 2024
b85aa64
fix: linting
shanejonas Sep 19, 2024
cd260c1
fix: linting
shanejonas Sep 19, 2024
1a3e450
fix: remove debug error
shanejonas Sep 19, 2024
a6ac2d2
fix: linting
shanejonas Sep 20, 2024
2ce2b2b
fix: ordering to make the comment make sense
shanejonas Sep 20, 2024
7c73968
Merge branch 'caip-multichain' into caip-multichain-caip-27-api-spec-…
shanejonas Sep 25, 2024
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@ licenseInfos.json
# API Spec tests
html-report/
html-report-multichain/
html-report-caip27/

2 changes: 1 addition & 1 deletion app/scripts/lib/multichain-api/adapters/caip-permission-adapter-middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export async function CaipPermissionAdapterMiddleware(
if (
!scopesObject[scope]?.methods?.includes(method) &&
!scopesObject['wallet:eip155']?.methods?.includes(method) &&
!scopesObject['wallet']?.methods?.includes(method)
!scopesObject.wallet?.methods?.includes(method)
) {
return end(providerErrors.unauthorized());
}
Expand Down
1 change: 1 addition & 0 deletions app/scripts/lib/multichain-api/scope/assert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const assertScopeSupported = (
const allMethodsSupported = methods.every((method) =>
isSupportedMethod(scopeString, method),
);

if (!allMethodsSupported) {
// not sure which one of these to use
// When provider evaluates requested methods to not be supported
Expand Down
132 changes: 132 additions & 0 deletions html-report-caip27/index.html
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 67 additions & 6 deletions lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,13 @@
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/eth-sig-util": true,
"@metamask/message-manager>jsonschema": true,
"@metamask/utils": true,
"browserify>buffer": true,
"jsonschema": true,
"uuid": true,
"webpack>events": true
}
},
"@metamask/message-manager>jsonschema": {
"packages": {
"browserify>url": true
}
},
"@metamask/message-signing-snap>@noble/ciphers": {
"globals": {
"TextDecoder": true,
Expand Down Expand Up @@ -3229,6 +3224,62 @@
"crypto": true
}
},
"@open-rpc/schema-utils-js": {
"packages": {
"@open-rpc/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
"@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"@open-rpc/schema-utils-js>ajv": true,
"@open-rpc/schema-utils-js>is-url": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
"@open-rpc/test-coverage>isomorphic-fetch": true
}
},
"@open-rpc/schema-utils-js>ajv": {
"globals": {
"console": true
},
"packages": {
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
"eslint>ajv>uri-js": true,
"eslint>fast-deep-equal": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch": {
"globals": {
"fetch.bind": true
},
"packages": {
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
"globals": {
"AbortController": true,
"Blob": true,
"FileReader": true,
"FormData": true,
"URLSearchParams.prototype.isPrototypeOf": true,
"XMLHttpRequest": true,
"console.warn": true,
"define": true,
"setTimeout": true
}
},
"@popperjs/core": {
"globals": {
"Element": true,
Expand Down Expand Up @@ -4125,6 +4176,11 @@
"koa>is-generator-function>has-tostringtag": true
}
},
"eslint>ajv>uri-js": {
"globals": {
"define": true
}
},
"eth-ens-namehash": {
"globals": {
"name": "write"
Expand Down Expand Up @@ -4597,6 +4653,11 @@
"readable-stream": true
}
},
"jsonschema": {
"packages": {
"browserify>url": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
73 changes: 67 additions & 6 deletions lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,13 @@
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/eth-sig-util": true,
"@metamask/message-manager>jsonschema": true,
"@metamask/utils": true,
"browserify>buffer": true,
"jsonschema": true,
"uuid": true,
"webpack>events": true
}
},
"@metamask/message-manager>jsonschema": {
"packages": {
"browserify>url": true
}
},
"@metamask/message-signing-snap>@noble/ciphers": {
"globals": {
"TextDecoder": true,
Expand Down Expand Up @@ -3229,6 +3224,62 @@
"crypto": true
}
},
"@open-rpc/schema-utils-js": {
"packages": {
"@open-rpc/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
"@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"@open-rpc/schema-utils-js>ajv": true,
"@open-rpc/schema-utils-js>is-url": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
"@open-rpc/test-coverage>isomorphic-fetch": true
}
},
"@open-rpc/schema-utils-js>ajv": {
"globals": {
"console": true
},
"packages": {
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
"eslint>ajv>uri-js": true,
"eslint>fast-deep-equal": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch": {
"globals": {
"fetch.bind": true
},
"packages": {
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
"globals": {
"AbortController": true,
"Blob": true,
"FileReader": true,
"FormData": true,
"URLSearchParams.prototype.isPrototypeOf": true,
"XMLHttpRequest": true,
"console.warn": true,
"define": true,
"setTimeout": true
}
},
"@popperjs/core": {
"globals": {
"Element": true,
Expand Down Expand Up @@ -4125,6 +4176,11 @@
"koa>is-generator-function>has-tostringtag": true
}
},
"eslint>ajv>uri-js": {
"globals": {
"define": true
}
},
"eth-ens-namehash": {
"globals": {
"name": "write"
Expand Down Expand Up @@ -4597,6 +4653,11 @@
"readable-stream": true
}
},
"jsonschema": {
"packages": {
"browserify>url": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
73 changes: 67 additions & 6 deletions lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,18 +1643,13 @@
"@metamask/base-controller": true,
"@metamask/controller-utils": true,
"@metamask/eth-sig-util": true,
"@metamask/message-manager>jsonschema": true,
"@metamask/utils": true,
"browserify>buffer": true,
"jsonschema": true,
"uuid": true,
"webpack>events": true
}
},
"@metamask/message-manager>jsonschema": {
"packages": {
"browserify>url": true
}
},
"@metamask/message-signing-snap>@noble/ciphers": {
"globals": {
"TextDecoder": true,
Expand Down Expand Up @@ -3229,6 +3224,62 @@
"crypto": true
}
},
"@open-rpc/schema-utils-js": {
"packages": {
"@open-rpc/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": true,
"@open-rpc/schema-utils-js>@json-schema-tools/meta-schema": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"@open-rpc/schema-utils-js>ajv": true,
"@open-rpc/schema-utils-js>is-url": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/dereferencer>@json-schema-tools/traverse": true,
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": true,
"eth-rpc-errors>fast-safe-stringify": true
}
},
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver": {
"packages": {
"@open-rpc/schema-utils-js>@json-schema-tools/reference-resolver>@json-schema-spec/json-pointer": true,
"@open-rpc/test-coverage>isomorphic-fetch": true
}
},
"@open-rpc/schema-utils-js>ajv": {
"globals": {
"console": true
},
"packages": {
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"@open-rpc/schema-utils-js>ajv>json-schema-traverse": true,
"eslint>ajv>uri-js": true,
"eslint>fast-deep-equal": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch": {
"globals": {
"fetch.bind": true
},
"packages": {
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": true
}
},
"@open-rpc/test-coverage>isomorphic-fetch>whatwg-fetch": {
"globals": {
"AbortController": true,
"Blob": true,
"FileReader": true,
"FormData": true,
"URLSearchParams.prototype.isPrototypeOf": true,
"XMLHttpRequest": true,
"console.warn": true,
"define": true,
"setTimeout": true
}
},
"@popperjs/core": {
"globals": {
"Element": true,
Expand Down Expand Up @@ -4125,6 +4176,11 @@
"koa>is-generator-function>has-tostringtag": true
}
},
"eslint>ajv>uri-js": {
"globals": {
"define": true
}
},
"eth-ens-namehash": {
"globals": {
"name": "write"
Expand Down Expand Up @@ -4597,6 +4653,11 @@
"readable-stream": true
}
},
"jsonschema": {
"packages": {
"browserify>url": true
}
},
"koa>content-disposition>safe-buffer": {
"packages": {
"browserify>buffer": true
Expand Down
Loading