Skip to content

Commit f988071

Browse files
[DF-21822] VULN Upgrades (#637)
* Go dependencies * Dependency upgrade * Go Dependency Upgrade * Updated package.jsons * Upgrades * yarn rc file * Adding yarn for yarn 2 * tool versions * fixed lint * Updated make file * removed yarn.lock * fixed gauntlet tests for yarn 2 * Upgraded yarn to 4.5.3 * Removed 3.5.1 * Remove cache files * Increased timeout * prettier changes * fix prompt * tidy --------- Co-authored-by: Augustus Chang <[email protected]> Co-authored-by: Augustus <[email protected]>
1 parent e1ec82f commit f988071

File tree

17 files changed

+12333
-11931
lines changed

17 files changed

+12333
-11931
lines changed

.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ vendor
1616
# Python virtual env
1717
.venv
1818
.direnv
19+
20+
# Yarn v2 files
21+
.yarn/releases/

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Languages
2-
nodejs 18.6.0
3-
yarn 1.22.19
2+
nodejs 22.14.0
3+
yarn 3.5.1
44
golang 1.23.3
55
python 3.9.13
66

.yarn/releases/yarn-4.5.3.cjs

Lines changed: 934 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
nodeLinker: node-modules
2+
3+
yarnPath: .yarn/releases/yarn-4.5.3.cjs

Makefile

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,22 @@ build-ts: build-ts-workspace build-cairo-contracts build-sol-contracts
8686

8787
.PHONY: build-ts-workspace
8888
build-ts-workspace:
89-
yarn install --frozen-lockfile
89+
yarn install --immutable
9090
yarn build
9191

9292
# TODO: use yarn workspaces features instead of managing separately like this
9393
# https://yarnpkg.com/cli/workspaces/foreach
9494
.PHONY: build-sol-contracts
9595
build-sol-contracts:
9696
cd contracts/ && \
97-
yarn install --frozen-lockfile && \
97+
yarn install --immutable && \
9898
yarn compile:solidity
9999

100100
# TODO: this should build cairo contracts when they are rewritten
101101
.PHONY: build-ts-examples
102102
build-ts-examples:
103103
cd examples/contracts/aggregator-consumer && \
104-
yarn install --frozen-lockfile && \
104+
yarn install --immutable && \
105105
yarn compile:solidity
106106

107107
.PHONY: gowork
@@ -240,22 +240,11 @@ test-examples:
240240
# cd packages-ts/starknet-gauntlet-example/ && \
241241
# yarn test
242242
test-integration-gauntlet: build-ts env-devnet-hardhat
243-
cd packages-ts/starknet-gauntlet/ && \
244-
yarn test
245-
cd packages-ts/starknet-gauntlet-argent/ && \
246-
yarn test
247-
cd packages-ts/starknet-gauntlet-cli/ && \
248-
yarn test
249-
cd packages-ts/starknet-gauntlet-multisig/ && \
250-
yarn test
251-
cd packages-ts/starknet-gauntlet-ocr2/ && \
252-
yarn test
253-
cd packages-ts/starknet-gauntlet-oz/ && \
254-
yarn test
255-
cd packages-ts/starknet-gauntlet-token/ && \
256-
yarn test
257-
cd packages-ts/starknet-gauntlet-emergency-protocol/ && \
258-
yarn test
243+
npx jest --runInBand --config ./jest.config.ts \
244+
--selectProjects starknet-gauntlet starknet-gauntlet-argent starknet-gauntlet-cli \
245+
starknet-gauntlet-multisig starknet-gauntlet-ocr2 starknet-gauntlet-oz \
246+
starknet-gauntlet-token starknet-gauntlet-emergency-protocol \
247+
--passWithNoTests
259248

260249
.PHONY: test-ts
261250
test-ts: test-ts-contracts test-integration-contracts test-integration-gauntlet

0 commit comments

Comments
 (0)