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.

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

Upgrade deps to 10.11.2 & 12.6.2 #1064

Merged
merged 28 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
69cf754
Upgrade deps
forgetso Feb 27, 2024
2289805
package-lock.json
forgetso Feb 27, 2024
0905dcf
bump typechain-polkadot versions
forgetso Feb 27, 2024
1069760
deps
forgetso Feb 28, 2024
e87d52c
protocol deps
forgetso Feb 28, 2024
789442b
Update package-lock.json
forgetso Feb 28, 2024
0040c78
Ignore strange error from TS
forgetso Feb 28, 2024
7ccb50a
lint
forgetso Feb 28, 2024
080dd97
Merge branch 'main' into upgrade-polkadot-deps
forgetso Mar 1, 2024
89f743f
Downgrade replace plugin
forgetso Mar 1, 2024
9d11669
build:all
forgetso Mar 1, 2024
b80499e
Package-lock.json
forgetso Mar 2, 2024
6d96e53
package-lock.json
forgetso Mar 2, 2024
094e52a
package-lock.json
forgetso Mar 2, 2024
b57aa23
Update package lock
forgetso Mar 4, 2024
26eb3be
build:typechain
forgetso Mar 4, 2024
3d33cfe
Merge branch 'main' into upgrade-polkadot-deps
forgetso Mar 4, 2024
cd26500
build:typechain
forgetso Mar 4, 2024
e6922b5
Package-lock.json
forgetso Mar 5, 2024
9b6dd27
merge
forgetso Mar 5, 2024
640a87e
build:typechain
forgetso Mar 5, 2024
4c36873
Merge branch 'main' into upgrade-polkadot-deps
HughParry Mar 6, 2024
253dbf1
Remove console.warn and warn
forgetso Mar 6, 2024
a99dff2
Merge branch 'fix-polkadotjs-postinstall-script-2' into upgrade-polka…
forgetso Mar 6, 2024
ee6c84f
fix remove polkadot js warnings script
goastler Mar 6, 2024
71635ad
Merge branch 'main' into upgrade-polkadot-deps
goastler Mar 6, 2024
4f1369d
pkg lock
goastler Mar 6, 2024
dda400c
git merge fix for regex change
goastler Mar 6, 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
24 changes: 12 additions & 12 deletions contracts/captcha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,18 @@
},
"homepage": "https://github.com/prosopo/captcha#readme",
"dependencies": {
"@polkadot/api": "10.11.1",
"@polkadot/api-contract": "10.11.1",
"@polkadot/keyring": "12.6.1",
"@polkadot/rpc-provider": "10.11.1",
"@polkadot/typegen": "10.11.1",
"@polkadot/types": "10.11.1",
"@polkadot/types-codec": "10.11.1",
"@polkadot/types-create": "10.11.1",
"@polkadot/util": "12.6.1",
"@polkadot/util-crypto": "12.6.1",
"@prosopo/typechain-polkadot": "1.1.13",
"@prosopo/typechain-types": "1.1.13"
"@polkadot/api": "10.11.2",
"@polkadot/api-contract": "10.11.2",
"@polkadot/keyring": "12.6.2",
"@polkadot/rpc-provider": "10.11.2",
"@polkadot/typegen": "10.11.2",
"@polkadot/types": "10.11.2",
"@polkadot/types-codec": "10.11.2",
"@polkadot/types-create": "10.11.2",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/typechain-polkadot": "1.1.14",
"@prosopo/typechain-types": "1.1.14"
},
"devDependencies": {
"tslib": "2.6.2",
Expand Down
2 changes: 1 addition & 1 deletion contracts/captcha/src/captcha.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"source": {
"hash": "0x3b12eb50a5cb2fabebfce64d1e8ca88245ccde5a881d9d05c5429e6e98d11139",
"hash": "0x1a6a2231e769ffa304a6813e59b9bd2b43744deef5af75f32a7c60ff65e3ba2c",
"language": "ink! 4.3.0",
"compiler": "rustc 1.69.0",
"build_info": {
Expand Down
4 changes: 2 additions & 2 deletions contracts/captcha/src/contract-info/captcha.ts

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions contracts/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
},
"homepage": "https://github.com/prosopo/captcha#readme",
"dependencies": {
"@prosopo/typechain-polkadot": "1.1.13",
"@prosopo/typechain-types": "1.1.13",
"@polkadot/api": "10.11.1",
"@polkadot/api-contract": "10.11.1",
"@polkadot/types": "10.11.1",
"@polkadot/types-codec": "10.11.1",
"@polkadot/keyring": "12.6.1",
"@polkadot/rpc-provider": "10.11.1",
"@polkadot/typegen": "10.11.1",
"@polkadot/types-create": "10.11.1",
"@polkadot/util": "12.6.1",
"@polkadot/util-crypto": "12.6.1"
"@prosopo/typechain-polkadot": "1.1.14",
"@prosopo/typechain-types": "1.1.14",
"@polkadot/api": "10.11.2",
"@polkadot/api-contract": "10.11.2",
"@polkadot/types": "10.11.2",
"@polkadot/types-codec": "10.11.2",
"@polkadot/keyring": "12.6.2",
"@polkadot/rpc-provider": "10.11.2",
"@polkadot/typegen": "10.11.2",
"@polkadot/types-create": "10.11.2",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2"
},
"devDependencies": {
"tslib": "2.6.2",
Expand Down
2 changes: 1 addition & 1 deletion contracts/common/src/common.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"source": {
"hash": "0x3a5d4eceea254f17ac1ce512b7e6a5857818bc2e657530d38bfdcbcc66450c49",
"hash": "0xc830dbe153609dc207383fa44e97145d0f449aebfdb1fb7575186812b0e9846a",
"language": "ink! 4.3.0",
"compiler": "rustc 1.69.0",
"build_info": {
Expand Down
4 changes: 2 additions & 2 deletions contracts/common/src/contract-info/common.ts

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions contracts/proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
},
"homepage": "https://github.com/prosopo/captcha#readme",
"dependencies": {
"@prosopo/typechain-polkadot": "1.1.13",
"@prosopo/typechain-types": "1.1.13",
"@polkadot/api": "10.11.1",
"@polkadot/api-contract": "10.11.1",
"@polkadot/types": "10.11.1",
"@polkadot/types-codec": "10.11.1",
"@polkadot/keyring": "12.6.1",
"@polkadot/rpc-provider": "10.11.1",
"@polkadot/typegen": "10.11.1",
"@polkadot/types-create": "10.11.1",
"@polkadot/util": "12.6.1",
"@polkadot/util-crypto": "12.6.1"
"@prosopo/typechain-polkadot": "1.1.14",
"@prosopo/typechain-types": "1.1.14",
"@polkadot/api": "10.11.2",
"@polkadot/api-contract": "10.11.2",
"@polkadot/types": "10.11.2",
"@polkadot/types-codec": "10.11.2",
"@polkadot/keyring": "12.6.2",
"@polkadot/rpc-provider": "10.11.2",
"@polkadot/typegen": "10.11.2",
"@polkadot/types-create": "10.11.2",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2"
},
"devDependencies": {
"tslib": "2.6.2",
Expand Down
4 changes: 2 additions & 2 deletions contracts/proxy/src/contract-info/proxy.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/proxy/src/proxy.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"source": {
"hash": "0x81032e46912a91208f1053356c6cba5f949ca74887e2c727b2bdf7e653a3a56b",
"hash": "0x06a07b2287c32764322813ae978d0565caa7c42e132ea68b2d209035aa8d7800",
"language": "ink! 4.3.0",
"compiler": "rustc 1.69.0",
"build_info": {
Expand Down
4 changes: 2 additions & 2 deletions demos/client-example-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"homepage": "https://github.com/prosopo/client-example-server#readme",
"dependencies": {
"@noble/hashes": "^1.3.1",
"@polkadot/util": "12.6.1",
"@polkadot/util-crypto": "12.6.1",
"@polkadot/util": "12.6.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/api": "0.2.41",
"@prosopo/contract": "0.2.41",
"@prosopo/procaptcha": "0.2.41",
Expand Down
10 changes: 5 additions & 5 deletions dev/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
"license": "Apache-2.0",
"dependencies": {
"@iarna/toml": "^2.2.5",
"@polkadot/api": "10.11.1",
"@polkadot/api-contract": "10.11.1",
"@polkadot/types": "10.11.1",
"@polkadot/util-crypto": "12.6.1",
"@polkadot/api": "10.11.2",
"@polkadot/api-contract": "10.11.2",
"@polkadot/types": "10.11.2",
"@polkadot/util-crypto": "12.6.2",
"@prosopo/api": "0.2.41",
"@prosopo/cli": "0.2.41",
"@prosopo/common": "0.2.41",
Expand Down Expand Up @@ -59,7 +59,7 @@
"yargs-parser": "^21.0.1"
},
"overrides": {
"@polkadot/keyring": "12.6.1"
"@polkadot/keyring": "12.6.2"
},
"devDependencies": {
"@esm-bundle/chai": "^4.3.4-fix.0",
Expand Down
6 changes: 6 additions & 0 deletions dev/scripts/src/util/exec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ export const exec = (
})

if (pipe || pipe === undefined) {
// https://github.com/microsoft/TypeScript/issues/44605
// Building a second time fixes this issue
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
prc.stdout.pipe(process.stdout)
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
prc.stderr.pipe(process.stderr)
}
stdin.pipe(prc.stdin)
Expand Down
Loading
Loading