Skip to content

Commit 1d59e90

Browse files
authored
[tilt] Fix issues (#801)
1 parent 677343c commit 1d59e90

File tree

7 files changed

+22
-16
lines changed

7 files changed

+22
-16
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

target_chains/cosmwasm/tools/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "tools",
2+
"name": "@pythnetwork/cosmwasm-deploy-tools",
33
"version": "1.0.0",
44
"description": "",
55
"main": "deploy-pyth-bridge.ts",

target_chains/ethereum/contracts/foundry.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[profile.default]
22
solc_version = '0.8.4'
33
optimizer = true
4-
optimizer_runs = 10000
4+
optimizer_runs = 5000
55
src = 'contracts'
66
# We put the tests into the forge-test directory (instead of test) so that
77
# truffle doesn't try to build them

target_chains/ethereum/contracts/truffle-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ module.exports = {
271271
settings: {
272272
optimizer: {
273273
enabled: true,
274-
runs: 10000,
274+
runs: 5000,
275275
},
276276
},
277277
},

target_chains/sui/contracts/sources/pyth.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ module pyth::pyth_tests{
963963
price_info_object_1 = vector::pop_back(&mut price_info_object_vec);
964964

965965
vector::destroy_empty(price_info_object_vec);
966-
966+
967967
let current_price_info = price_info::get_price_info_from_price_info_object(&price_info_object_1);
968968
let current_price_feed = price_info::get_price_feed(&current_price_info);
969969
let current_price = price_feed::get_price(current_price_feed);

tilt_devnet/docker_images/Dockerfile.cosmwasm

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,21 @@ COPY wormhole_attester/sdk/rust /wormhole_attester/sdk/rust
2525
RUN --mount=type=cache,target=/code/target,id=cosmwasm_pyth_target --mount=type=cache,target=/usr/local/cargo/registry optimize_workspace.sh
2626

2727
# Contract deployment stage
28-
FROM node:16-buster-slim@sha256:93c9fc3550f5f7d159f282027228e90e3a7f8bf38544758024f005e82607f546
28+
FROM lerna
2929

30+
USER root
3031
RUN apt update && apt install netcat curl jq -y
3132

32-
WORKDIR /app/tools
33+
USER 1000
3334

34-
COPY --from=wormhole_builder /code/artifacts/wormhole.wasm /app/artifacts/wormhole.wasm
35-
COPY --from=pyth_builder /code/artifacts/pyth_cosmwasm.wasm /app/artifacts/pyth_cosmwasm.wasm
35+
COPY --from=wormhole_builder /code/artifacts/wormhole.wasm /home/node/target_chains/cosmwasm/artifacts/wormhole.wasm
36+
COPY --from=pyth_builder /code/artifacts/pyth_cosmwasm.wasm /home/node/target_chains/cosmwasm/artifacts/pyth_cosmwasm.wasm
3637

37-
COPY target_chains/cosmwasm/tools/package.json target_chains/cosmwasm/tools/package-lock.json /app/tools/
38-
RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
39-
npm ci
40-
COPY target_chains/cosmwasm/tools /app/tools
38+
WORKDIR /home/node/
39+
40+
COPY --chown=1000:1000 governance/xc_governance_sdk_js governance/xc_governance_sdk_js
41+
COPY --chown=1000:1000 target_chains/cosmwasm/tools target_chains/cosmwasm/tools
42+
43+
RUN npx lerna run build --scope="@pythnetwork/cosmwasm-deploy-tools" --include-dependencies
44+
45+
WORKDIR /home/node/target_chains/cosmwasm/tools

tilt_devnet/k8s/terra-devnet.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ spec:
7777
command:
7878
- /bin/sh
7979
- -c
80-
- "sh /app/tools/deploy.sh && touch /app/tools/success && sleep infinity"
80+
- "sh /home/node/target_chains/cosmwasm/tools/deploy.sh &&
81+
touch /home/node/success && sleep infinity"
8182
readinessProbe:
8283
exec:
8384
command:
8485
- test
8586
- -e
86-
- "/app/tools/success"
87+
- "/home/node/success"
8788
initialDelaySeconds: 5
8889
periodSeconds: 5
8990
restartPolicy: Always

0 commit comments

Comments
 (0)