Skip to content

Commit e9b080b

Browse files
evan-grayevan-gray
committed
tilt: solana-test-validator multi-platform support
1 parent 6359412 commit e9b080b

File tree

3 files changed

+34
-20
lines changed

3 files changed

+34
-20
lines changed

‎Tiltfile

-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ update_settings(max_parallel_updates = 10)
3636
# Runtime configuration
3737
config.define_bool("ci", False, "We are running in CI")
3838
config.define_bool("manual", False, "Set TRIGGER_MODE_MANUAL by default")
39-
config.define_bool("m1", False, "Use this flag for M-series Macs (e.g. use an arm64 solana-test-validator due to AVX requirement)")
4039

4140
config.define_string("num", False, "Number of guardian nodes to run")
4241
config.define_string("maxWorkers", False, "Maximum number of workers for sdk-ci-tests. See https://jestjs.io/docs/cli#--maxworkersnumstring")
@@ -103,7 +102,6 @@ btc = cfg.get("btc", False)
103102
redis = cfg.get('redis', ci)
104103
generic_relayer = cfg.get("generic_relayer", ci)
105104
query_server = cfg.get("query_server", ci)
106-
m1 = cfg.get("m1", False)
107105

108106
if ci:
109107
guardiand_loglevel = cfg.get("guardiand_loglevel", "warn")
@@ -489,15 +487,10 @@ if solana or pythnet:
489487

490488
# solana local devnet
491489

492-
build_args = {}
493-
if m1:
494-
build_args = {"BASE_IMAGE": "ghcr.io/wormholelabs-xyz/solana-test-validator-m1:1.17.29@sha256:c5a43c0762f2dab4873a9e632a389029b6d5f706be7dfb89a42a66cc65a3dd24"}
495-
496490
docker_build(
497491
ref = "solana-test-validator",
498492
context = "solana",
499493
dockerfile = "solana/Dockerfile.test-validator",
500-
build_args = build_args
501494
)
502495

503496
k8s_yaml_with_ns("devnet/solana-devnet.yaml")

‎sdk/js-query/src/query/solana.test.ts

+33-11
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,9 @@ describe("solana", () => {
204204
expect(sar.results[0].lamports.toString()).toEqual(
205205
BigInt(1461600).toString()
206206
);
207-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
207+
expect(sar.results[0].rentEpoch.toString()).toEqual(
208+
BigInt("18446744073709551615").toString()
209+
);
208210
expect(sar.results[0].executable).toEqual(false);
209211
expect(base58.encode(Buffer.from(sar.results[0].owner))).toEqual(
210212
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -216,7 +218,9 @@ describe("solana", () => {
216218
expect(sar.results[0].lamports.toString()).toEqual(
217219
BigInt(1461600).toString()
218220
);
219-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
221+
expect(sar.results[0].rentEpoch.toString()).toEqual(
222+
BigInt("18446744073709551615").toString()
223+
);
220224
expect(sar.results[1].executable).toEqual(false);
221225
expect(base58.encode(Buffer.from(sar.results[1].owner))).toEqual(
222226
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -268,7 +272,9 @@ describe("solana", () => {
268272
expect(sar.results[0].lamports.toString()).toEqual(
269273
BigInt(1461600).toString()
270274
);
271-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
275+
expect(sar.results[0].rentEpoch.toString()).toEqual(
276+
BigInt("18446744073709551615").toString()
277+
);
272278
expect(sar.results[0].executable).toEqual(false);
273279
expect(base58.encode(Buffer.from(sar.results[0].owner))).toEqual(
274280
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -280,7 +286,9 @@ describe("solana", () => {
280286
expect(sar.results[0].lamports.toString()).toEqual(
281287
BigInt(1461600).toString()
282288
);
283-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
289+
expect(sar.results[0].rentEpoch.toString()).toEqual(
290+
BigInt("18446744073709551615").toString()
291+
);
284292
expect(sar.results[1].executable).toEqual(false);
285293
expect(base58.encode(Buffer.from(sar.results[1].owner))).toEqual(
286294
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -398,7 +406,9 @@ describe("solana", () => {
398406
expect(sar.results[0].lamports.toString()).not.toEqual(
399407
BigInt(0).toString()
400408
);
401-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
409+
expect(sar.results[0].rentEpoch.toString()).toEqual(
410+
BigInt("18446744073709551615").toString()
411+
);
402412
expect(sar.results[0].executable).toEqual(false);
403413
expect(Buffer.from(sar.results[0].owner).toString("hex")).toEqual(
404414
"02c806312cbe5b79ef8aa6c17e3f423d8fdfe1d46909fb1f6cdf65ee8e2e6faa"
@@ -455,7 +465,9 @@ describe("solana", () => {
455465
expect(sar.results[0].lamports.toString()).not.toEqual(
456466
BigInt(0).toString()
457467
);
458-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
468+
expect(sar.results[0].rentEpoch.toString()).toEqual(
469+
BigInt("18446744073709551615").toString()
470+
);
459471
expect(sar.results[0].executable).toEqual(false);
460472
expect(Buffer.from(sar.results[0].owner).toString("hex")).toEqual(
461473
"02c806312cbe5b79ef8aa6c17e3f423d8fdfe1d46909fb1f6cdf65ee8e2e6faa"
@@ -519,7 +531,9 @@ describe("solana", () => {
519531
expect(sar.results[0].lamports.toString()).toEqual(
520532
BigInt(1461600).toString()
521533
);
522-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
534+
expect(sar.results[0].rentEpoch.toString()).toEqual(
535+
BigInt("18446744073709551615").toString()
536+
);
523537
expect(sar.results[0].executable).toEqual(false);
524538
expect(base58.encode(Buffer.from(sar.results[0].owner))).toEqual(
525539
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -531,7 +545,9 @@ describe("solana", () => {
531545
expect(sar.results[0].lamports.toString()).toEqual(
532546
BigInt(1461600).toString()
533547
);
534-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
548+
expect(sar.results[0].rentEpoch.toString()).toEqual(
549+
BigInt("18446744073709551615").toString()
550+
);
535551
expect(sar.results[1].executable).toEqual(false);
536552
expect(base58.encode(Buffer.from(sar.results[1].owner))).toEqual(
537553
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -584,7 +600,9 @@ describe("solana", () => {
584600
expect(sar.results[0].lamports.toString()).toEqual(
585601
BigInt(1461600).toString()
586602
);
587-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
603+
expect(sar.results[0].rentEpoch.toString()).toEqual(
604+
BigInt("18446744073709551615").toString()
605+
);
588606
expect(sar.results[0].executable).toEqual(false);
589607
expect(base58.encode(Buffer.from(sar.results[0].owner))).toEqual(
590608
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -596,7 +614,9 @@ describe("solana", () => {
596614
expect(sar.results[0].lamports.toString()).toEqual(
597615
BigInt(1461600).toString()
598616
);
599-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
617+
expect(sar.results[0].rentEpoch.toString()).toEqual(
618+
BigInt("18446744073709551615").toString()
619+
);
600620
expect(sar.results[1].executable).toEqual(false);
601621
expect(base58.encode(Buffer.from(sar.results[1].owner))).toEqual(
602622
"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -654,7 +674,9 @@ describe("solana", () => {
654674
expect(sar.results[0].lamports.toString()).not.toEqual(
655675
BigInt(0).toString()
656676
);
657-
expect(sar.results[0].rentEpoch.toString()).toEqual(BigInt(0).toString());
677+
expect(sar.results[0].rentEpoch.toString()).toEqual(
678+
BigInt("18446744073709551615").toString()
679+
);
658680
expect(sar.results[0].executable).toEqual(false);
659681
expect(Buffer.from(sar.results[0].owner).toString("hex")).toEqual(
660682
"02c806312cbe5b79ef8aa6c17e3f423d8fdfe1d46909fb1f6cdf65ee8e2e6faa"

‎solana/Dockerfile.test-validator

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
ARG BASE_IMAGE=solana-contract
2-
FROM ${BASE_IMAGE}
1+
FROM ghcr.io/wormholelabs-xyz/solana-test-validator:1.17.29@sha256:b1f85eed2d33a2bd0378204ab4d1e16537de35407cdcfeedbd021b31636618bc
32
COPY --from=solana-contract /opt/solana/deps/ /opt/solana/deps/

0 commit comments

Comments
 (0)