Skip to content

Commit 84f9b5c

Browse files
committed
test: patch v2
1 parent 1b0f765 commit 84f9b5c

4 files changed

+86
-140
lines changed

a3p-integration/.yarn/patches/@agoric-synthetic-chain-npm-0.4.3-5eef0da8d9.patch

-34
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/dist/upgrade-test-scripts/install_deps.sh b/dist/upgrade-test-scripts/install_deps.sh
2+
index 7f5a986b05c2e5672303b3f06ddf74a093a1f02f..f96fd3883abe677e0538848017b16b28ba5da572 100755
3+
--- a/dist/upgrade-test-scripts/install_deps.sh
4+
+++ b/dist/upgrade-test-scripts/install_deps.sh
5+
@@ -20,6 +20,17 @@ if [ -n "$PROPOSAL_PATH" ]; then
6+
if test -f "yarn.lock"; then
7+
yarn --version # only Berry supported, so next commands will fail on classic
8+
yarn config set --home enableTelemetry 0
9+
- yarn install --immutable
10+
+ if yarn install --immutable; then
11+
+ echo "Success"
12+
+ exit 0
13+
+ fi
14+
+ echo Install failed. Debugging…
15+
+ # Disable CI default (immutable)
16+
+ unset CI
17+
+ echo "copying existing yarn.lock"
18+
+ cp yarn.lock yarn.lock.bak
19+
+ echo "installing"
20+
+ yarn install
21+
+ exit 0
22+
fi
23+
fi

a3p-integration/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"doctor": "yarn synthetic-chain doctor"
1717
},
1818
"dependencies": {
19-
"@agoric/synthetic-chain": "patch:@agoric/synthetic-chain@npm%3A0.4.3#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.3-5eef0da8d9.patch",
19+
"@agoric/synthetic-chain": "patch:@agoric/synthetic-chain@npm%3A0.4.5#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.5-96b3c6b790.patch",
2020
"@types/better-sqlite3": "^7.6.11"
2121
},
2222
"packageManager": "[email protected]",

a3p-integration/yarn.lock

+62-105
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,33 @@ __metadata:
55
version: 8
66
cacheKey: 10c0
77

8-
"@agoric/synthetic-chain@npm:0.4.3":
9-
version: 0.4.3
10-
resolution: "@agoric/synthetic-chain@npm:0.4.3"
8+
"@agoric/synthetic-chain@npm:0.4.5":
9+
version: 0.4.5
10+
resolution: "@agoric/synthetic-chain@npm:0.4.5"
1111
dependencies:
1212
"@endo/zip": "npm:^1.0.7"
1313
better-sqlite3: "npm:^9.6.0"
1414
chalk: "npm:^5.3.0"
1515
cosmjs-types: "npm:^0.9.0"
16-
execa: "npm:^9.3.1"
16+
execa: "npm:8.x"
1717
bin:
1818
synthetic-chain: dist/cli/cli.js
19-
checksum: 10c0/b904b531bf2d4066322e4b86b7653fa4fd88d52cce86d82d82ebaecedd526a83832488e1f82b5d0ece23cf5b13fa6bf4e49b4c25339a3c17a658c1302ef9321b
19+
checksum: 10c0/f693b52550fc54faa1e04450d9e4b399c929cdd4b5a177c20790465308a66407695ef0d19ac8d69298aba8cb32a912a2b06427b012e170a7ce2f1cf6b149abd2
2020
languageName: node
2121
linkType: hard
2222

23-
"@agoric/synthetic-chain@patch:@agoric/synthetic-chain@npm%3A0.4.3#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.3-5eef0da8d9.patch":
24-
version: 0.4.3
25-
resolution: "@agoric/synthetic-chain@patch:@agoric/synthetic-chain@npm%3A0.4.3#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.3-5eef0da8d9.patch::version=0.4.3&hash=765f08"
23+
"@agoric/synthetic-chain@patch:@agoric/synthetic-chain@npm%3A0.4.5#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.5-96b3c6b790.patch":
24+
version: 0.4.5
25+
resolution: "@agoric/synthetic-chain@patch:@agoric/synthetic-chain@npm%3A0.4.5#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.5-96b3c6b790.patch::version=0.4.5&hash=61168b"
2626
dependencies:
2727
"@endo/zip": "npm:^1.0.7"
2828
better-sqlite3: "npm:^9.6.0"
2929
chalk: "npm:^5.3.0"
3030
cosmjs-types: "npm:^0.9.0"
31-
execa: "npm:^9.3.1"
31+
execa: "npm:8.x"
3232
bin:
3333
synthetic-chain: dist/cli/cli.js
34-
checksum: 10c0/74baf88e86e0866c7d144c877ba2af65c9d5718100b92f409f3523da20349555e60654c23dfd13f826c14d0b1eefef80a0d4186c42d9fbc1eb3d68f10567b063
34+
checksum: 10c0/f35ecd38fb088863c83c373ad0fa20a7641a77af4019300d04bc17687fef0c2e843703a9953d33bc0dffd7a9f3f5e771a79d39f1449922d58a66561c2fdd544c
3535
languageName: node
3636
linkType: hard
3737

@@ -85,20 +85,6 @@ __metadata:
8585
languageName: node
8686
linkType: hard
8787

88-
"@sec-ant/readable-stream@npm:^0.4.1":
89-
version: 0.4.1
90-
resolution: "@sec-ant/readable-stream@npm:0.4.1"
91-
checksum: 10c0/64e9e9cf161e848067a5bf60cdc04d18495dc28bb63a8d9f8993e4dd99b91ad34e4b563c85de17d91ffb177ec17a0664991d2e115f6543e73236a906068987af
92-
languageName: node
93-
linkType: hard
94-
95-
"@sindresorhus/merge-streams@npm:^4.0.0":
96-
version: 4.0.0
97-
resolution: "@sindresorhus/merge-streams@npm:4.0.0"
98-
checksum: 10c0/482ee543629aa1933b332f811a1ae805a213681ecdd98c042b1c1b89387df63e7812248bb4df3910b02b3cc5589d3d73e4393f30e197c9dde18046ccd471fc6b
99-
languageName: node
100-
linkType: hard
101-
10288
"@types/better-sqlite3@npm:^7.6.11":
10389
version: 7.6.11
10490
resolution: "@types/better-sqlite3@npm:7.6.11"
@@ -407,23 +393,20 @@ __metadata:
407393
languageName: node
408394
linkType: hard
409395

410-
"execa@npm:^9.3.1":
411-
version: 9.3.1
412-
resolution: "execa@npm:9.3.1"
396+
"execa@npm:8.x":
397+
version: 8.0.1
398+
resolution: "execa@npm:8.0.1"
413399
dependencies:
414-
"@sindresorhus/merge-streams": "npm:^4.0.0"
415400
cross-spawn: "npm:^7.0.3"
416-
figures: "npm:^6.1.0"
417-
get-stream: "npm:^9.0.0"
418-
human-signals: "npm:^8.0.0"
419-
is-plain-obj: "npm:^4.1.0"
420-
is-stream: "npm:^4.0.1"
421-
npm-run-path: "npm:^5.2.0"
422-
pretty-ms: "npm:^9.0.0"
401+
get-stream: "npm:^8.0.1"
402+
human-signals: "npm:^5.0.0"
403+
is-stream: "npm:^3.0.0"
404+
merge-stream: "npm:^2.0.0"
405+
npm-run-path: "npm:^5.1.0"
406+
onetime: "npm:^6.0.0"
423407
signal-exit: "npm:^4.1.0"
424-
strip-final-newline: "npm:^4.0.0"
425-
yoctocolors: "npm:^2.0.0"
426-
checksum: 10c0/113979ff56575f6cb69fd021eb3894a674fb59b264f5e8c2b9b30e301629abc4f44cee881e680f9fb3b7d4956645df76a2d8c0006869dea985f96ec65f07b226
408+
strip-final-newline: "npm:^3.0.0"
409+
checksum: 10c0/2c52d8775f5bf103ce8eec9c7ab3059909ba350a5164744e9947ed14a53f51687c040a250bda833f906d1283aa8803975b84e6c8f7a7c42f99dc8ef80250d1af
427410
languageName: node
428411
linkType: hard
429412

@@ -441,15 +424,6 @@ __metadata:
441424
languageName: node
442425
linkType: hard
443426

444-
"figures@npm:^6.1.0":
445-
version: 6.1.0
446-
resolution: "figures@npm:6.1.0"
447-
dependencies:
448-
is-unicode-supported: "npm:^2.0.0"
449-
checksum: 10c0/9159df4264d62ef447a3931537de92f5012210cf5135c35c010df50a2169377581378149abfe1eb238bd6acbba1c0d547b1f18e0af6eee49e30363cedaffcfe4
450-
languageName: node
451-
linkType: hard
452-
453427
"file-uri-to-path@npm:1.0.0":
454428
version: 1.0.0
455429
resolution: "file-uri-to-path@npm:1.0.0"
@@ -492,13 +466,10 @@ __metadata:
492466
languageName: node
493467
linkType: hard
494468

495-
"get-stream@npm:^9.0.0":
496-
version: 9.0.1
497-
resolution: "get-stream@npm:9.0.1"
498-
dependencies:
499-
"@sec-ant/readable-stream": "npm:^0.4.1"
500-
is-stream: "npm:^4.0.1"
501-
checksum: 10c0/d70e73857f2eea1826ac570c3a912757dcfbe8a718a033fa0c23e12ac8e7d633195b01710e0559af574cbb5af101009b42df7b6f6b29ceec8dbdf7291931b948
469+
"get-stream@npm:^8.0.1":
470+
version: 8.0.1
471+
resolution: "get-stream@npm:8.0.1"
472+
checksum: 10c0/5c2181e98202b9dae0bb4a849979291043e5892eb40312b47f0c22b9414fc9b28a3b6063d2375705eb24abc41ecf97894d9a51f64ff021511b504477b27b4290
502473
languageName: node
503474
linkType: hard
504475

@@ -558,10 +529,10 @@ __metadata:
558529
languageName: node
559530
linkType: hard
560531

561-
"human-signals@npm:^8.0.0":
562-
version: 8.0.0
563-
resolution: "human-signals@npm:8.0.0"
564-
checksum: 10c0/e4dac4f7d3eb791ed04129fc6a85bd454a9102d3e3b76c911d0db7057ebd60b2956b435b5b5712aec18960488ede3c21ef7c56e42cdd70760c0d84d3c05cd92e
532+
"human-signals@npm:^5.0.0":
533+
version: 5.0.0
534+
resolution: "human-signals@npm:5.0.0"
535+
checksum: 10c0/5a9359073fe17a8b58e5a085e9a39a950366d9f00217c4ff5878bd312e09d80f460536ea6a3f260b5943a01fe55c158d1cea3fc7bee3d0520aeef04f6d915c82
565536
languageName: node
566537
linkType: hard
567538

@@ -630,24 +601,10 @@ __metadata:
630601
languageName: node
631602
linkType: hard
632603

633-
"is-plain-obj@npm:^4.1.0":
634-
version: 4.1.0
635-
resolution: "is-plain-obj@npm:4.1.0"
636-
checksum: 10c0/32130d651d71d9564dc88ba7e6fda0e91a1010a3694648e9f4f47bb6080438140696d3e3e15c741411d712e47ac9edc1a8a9de1fe76f3487b0d90be06ac9975e
637-
languageName: node
638-
linkType: hard
639-
640-
"is-stream@npm:^4.0.1":
641-
version: 4.0.1
642-
resolution: "is-stream@npm:4.0.1"
643-
checksum: 10c0/2706c7f19b851327ba374687bc4a3940805e14ca496dc672b9629e744d143b1ad9c6f1b162dece81c7bfbc0f83b32b61ccc19ad2e05aad2dd7af347408f60c7f
644-
languageName: node
645-
linkType: hard
646-
647-
"is-unicode-supported@npm:^2.0.0":
648-
version: 2.1.0
649-
resolution: "is-unicode-supported@npm:2.1.0"
650-
checksum: 10c0/a0f53e9a7c1fdbcf2d2ef6e40d4736fdffff1c9f8944c75e15425118ff3610172c87bf7bc6c34d3903b04be59790bb2212ddbe21ee65b5a97030fc50370545a5
604+
"is-stream@npm:^3.0.0":
605+
version: 3.0.0
606+
resolution: "is-stream@npm:3.0.0"
607+
checksum: 10c0/eb2f7127af02ee9aa2a0237b730e47ac2de0d4e76a4a905a50a11557f2339df5765eaea4ceb8029f1efa978586abe776908720bfcb1900c20c6ec5145f6f29d8
651608
languageName: node
652609
linkType: hard
653610

@@ -713,6 +670,20 @@ __metadata:
713670
languageName: node
714671
linkType: hard
715672

673+
"merge-stream@npm:^2.0.0":
674+
version: 2.0.0
675+
resolution: "merge-stream@npm:2.0.0"
676+
checksum: 10c0/867fdbb30a6d58b011449b8885601ec1690c3e41c759ecd5a9d609094f7aed0096c37823ff4a7190ef0b8f22cc86beb7049196ff68c016e3b3c671d0dac91ce5
677+
languageName: node
678+
linkType: hard
679+
680+
"mimic-fn@npm:^4.0.0":
681+
version: 4.0.0
682+
resolution: "mimic-fn@npm:4.0.0"
683+
checksum: 10c0/de9cc32be9996fd941e512248338e43407f63f6d497abe8441fa33447d922e927de54d4cc3c1a3c6d652857acd770389d5a3823f311a744132760ce2be15ccbf
684+
languageName: node
685+
linkType: hard
686+
716687
"mimic-response@npm:^3.1.0":
717688
version: 3.1.0
718689
resolution: "mimic-response@npm:3.1.0"
@@ -897,7 +868,7 @@ __metadata:
897868
languageName: node
898869
linkType: hard
899870

900-
"npm-run-path@npm:^5.2.0":
871+
"npm-run-path@npm:^5.1.0":
901872
version: 5.3.0
902873
resolution: "npm-run-path@npm:5.3.0"
903874
dependencies:
@@ -915,6 +886,15 @@ __metadata:
915886
languageName: node
916887
linkType: hard
917888

889+
"onetime@npm:^6.0.0":
890+
version: 6.0.0
891+
resolution: "onetime@npm:6.0.0"
892+
dependencies:
893+
mimic-fn: "npm:^4.0.0"
894+
checksum: 10c0/4eef7c6abfef697dd4479345a4100c382d73c149d2d56170a54a07418c50816937ad09500e1ed1e79d235989d073a9bade8557122aee24f0576ecde0f392bb6c
895+
languageName: node
896+
linkType: hard
897+
918898
"p-map@npm:^4.0.0":
919899
version: 4.0.0
920900
resolution: "p-map@npm:4.0.0"
@@ -924,13 +904,6 @@ __metadata:
924904
languageName: node
925905
linkType: hard
926906

927-
"parse-ms@npm:^4.0.0":
928-
version: 4.0.0
929-
resolution: "parse-ms@npm:4.0.0"
930-
checksum: 10c0/a7900f4f1ebac24cbf5e9708c16fb2fd482517fad353aecd7aefb8c2ba2f85ce017913ccb8925d231770404780df46244ea6fec598b3bde6490882358b4d2d16
931-
languageName: node
932-
linkType: hard
933-
934907
"path-key@npm:^3.1.0":
935908
version: 3.1.1
936909
resolution: "path-key@npm:3.1.1"
@@ -977,15 +950,6 @@ __metadata:
977950
languageName: node
978951
linkType: hard
979952

980-
"pretty-ms@npm:^9.0.0":
981-
version: 9.1.0
982-
resolution: "pretty-ms@npm:9.1.0"
983-
dependencies:
984-
parse-ms: "npm:^4.0.0"
985-
checksum: 10c0/fd111aad8800a04dfd654e6016da69bdaa6fc6a4c280f8e727cffd8b5960558e94942f1a94d4aa6e4d179561a0fbb0366a9ebe0ccefbbb0f8ff853b129cdefb9
986-
languageName: node
987-
linkType: hard
988-
989953
"proc-log@npm:^3.0.0":
990954
version: 3.0.0
991955
resolution: "proc-log@npm:3.0.0"
@@ -1049,7 +1013,7 @@ __metadata:
10491013
version: 0.0.0-use.local
10501014
resolution: "root-workspace-0b6124@workspace:."
10511015
dependencies:
1052-
"@agoric/synthetic-chain": "patch:@agoric/synthetic-chain@npm%3A0.4.3#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.3-5eef0da8d9.patch"
1016+
"@agoric/synthetic-chain": "patch:@agoric/synthetic-chain@npm%3A0.4.5#~/.yarn/patches/@agoric-synthetic-chain-npm-0.4.5-96b3c6b790.patch"
10531017
"@types/better-sqlite3": "npm:^7.6.11"
10541018
languageName: unknown
10551019
linkType: soft
@@ -1206,10 +1170,10 @@ __metadata:
12061170
languageName: node
12071171
linkType: hard
12081172

1209-
"strip-final-newline@npm:^4.0.0":
1210-
version: 4.0.0
1211-
resolution: "strip-final-newline@npm:4.0.0"
1212-
checksum: 10c0/b0cf2b62d597a1b0e3ebc42b88767f0a0d45601f89fd379a928a1812c8779440c81abba708082c946445af1d6b62d5f16e2a7cf4f30d9d6587b89425fae801ff
1173+
"strip-final-newline@npm:^3.0.0":
1174+
version: 3.0.0
1175+
resolution: "strip-final-newline@npm:3.0.0"
1176+
checksum: 10c0/a771a17901427bac6293fd416db7577e2bc1c34a19d38351e9d5478c3c415f523f391003b42ed475f27e33a78233035df183525395f731d3bfb8cdcbd4da08ce
12131177
languageName: node
12141178
linkType: hard
12151179

@@ -1357,10 +1321,3 @@ __metadata:
13571321
checksum: 10c0/2286b5e8dbfe22204ab66e2ef5cc9bbb1e55dfc873bbe0d568aa943eb255d131890dfd5bf243637273d31119b870f49c18fcde2c6ffbb7a7a092b870dc90625a
13581322
languageName: node
13591323
linkType: hard
1360-
1361-
"yoctocolors@npm:^2.0.0":
1362-
version: 2.1.1
1363-
resolution: "yoctocolors@npm:2.1.1"
1364-
checksum: 10c0/85903f7fa96f1c70badee94789fade709f9d83dab2ec92753d612d84fcea6d34c772337a9f8914c6bed2f5fc03a428ac5d893e76fab636da5f1236ab725486d0
1365-
languageName: node
1366-
linkType: hard

0 commit comments

Comments
 (0)