chore: pull monorepo changes (#131)

* Project import generated by Copybara.

GitOrigin-RevId: 968ada589196194c2f24c4761a5d106b4eb18e03

* chore: manual import cleanup

* chore: Update pnpm lockfile

---------

Co-authored-by: Copybara <[email protected]>
Co-authored-by: gallynaut <[email protected]>

Author: 3 people

examples/functions/01_basic_oracle/Cargo.lock

@@ -19,6 +19,6 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-switchboard-solana = { version = "=0.28.15", features = [ ] }
-# switchboard-solana = { version = "0.28.4", path = "../../../rust/switchboard-solana" }
+switchboard-solana = { version = "0.28.19", features = [] }
+# switchboard-solana = { version = "0.28.19", path = "../../../rust/switchboard-solana" }
 bytemuck = "^1"

examples/functions/01_basic_oracle/Cargo.toml

@@ -15,7 +15,7 @@
     "@coral-xyz/anchor": "^0.28.0",
     "@solana/spl-token": "^0.3.6",
     "@solana/web3.js": "^1.78.0",
-    "@switchboard-xyz/solana.js": "workspace:*"
+    "@switchboard-xyz/solana.js": "workspace:^"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",

examples/functions/01_basic_oracle/package.json

@@ -16,6 +16,6 @@ futures = "0.3"
 serde = "^1"
 serde_json = "^1"
 switchboard-utils = "0.8.0"
-switchboard-solana = { version = "=0.28.15", features = [ "client" ] }
-# switchboard-solana = { version = "0.28.4", path = "../../../../rust/switchboard-solana" }
+switchboard-solana = { version = "0.28.19" }
+# switchboard-solana = { version = "0.28.19", path = "../../../../rust/switchboard-solana" }
 # switchboard-utils = { version = "0.8.0", path = "../../../../../../rust/switchboard-utils" }

examples/functions/01_basic_oracle/sgx-function/.gitignore renamed to examples/functions/01_basic_oracle/switchboard-function/.gitignore

@@ -1,22 +1,19 @@
 # syntax=docker/dockerfile:1.4
 FROM switchboardlabs/sgx-function AS builder
 
-ARG CARGO_NAME=switchboard-function
-ENV CARGO_NAME=$CARGO_NAME
-
 WORKDIR /home/root/switchboard-function
 COPY ./Cargo.lock ./Cargo.toml ./
 COPY ./src ./src
 
-WORKDIR /home/root/switchboard-function/sgx-function
-COPY ./sgx-function/Cargo.lock ./sgx-function/Cargo.toml  ./
-COPY ./sgx-function/src ./src
+WORKDIR /home/root/switchboard-function/switchboard-function
+COPY ./switchboard-function/Cargo.lock ./switchboard-function/Cargo.toml  ./
+COPY ./switchboard-function/src ./src
 
 RUN --mount=type=cache,target=/usr/local/cargo/registry,id=${TARGETPLATFORM} \
     --mount=type=cache,target=target,id=${TARGETPLATFORM} \
     cargo build --release && \
     cargo strip && \
-    mv target/release/${CARGO_NAME} /sgx/app
+    mv target/release/basic-oracle-function /sgx/app
 
 FROM switchboardlabs/sgx-function
 

examples/functions/01_basic_oracle/sgx-function/Cargo.lock renamed to examples/functions/01_basic_oracle/switchboard-function/Cargo.lock

@@ -1,9 +1,6 @@
 # syntax=docker/dockerfile:1.4
 FROM switchboardlabs/sgx-function AS builder
 
-ARG CARGO_NAME=switchboard-function
-ENV CARGO_NAME=$CARGO_NAME
-
 WORKDIR /home/root/solana-sdk
 
 COPY ./rust/switchboard-common/Cargo.toml \
@@ -18,9 +15,9 @@ COPY ./chains/solana/examples/functions/01_basic_oracle/Cargo.toml \
      ./chains/solana/examples/functions/01_basic_oracle/Cargo.lock \
      ./chains/solana/examples/functions/01_basic_oracle/
 
-COPY ./chains/solana/examples/functions/01_basic_oracle/sgx-function/Cargo.toml \
-     ./chains/solana/examples/functions/01_basic_oracle/sgx-function/Cargo.lock \
-     ./chains/solana/examples/functions/01_basic_oracle/sgx-function/
+COPY ./chains/solana/examples/functions/01_basic_oracle/switchboard-function/Cargo.toml \
+     ./chains/solana/examples/functions/01_basic_oracle/switchboard-function/Cargo.lock \
+     ./chains/solana/examples/functions/01_basic_oracle/switchboard-function/
 
 COPY ./rust/switchboard-common/src \
      ./rust/switchboard-common/src/
@@ -31,15 +28,15 @@ COPY ./rust/switchboard-solana/src \
 COPY ./chains/solana/examples/functions/01_basic_oracle/src \
      ./chains/solana/examples/functions/01_basic_oracle/src/
 
-COPY ./chains/solana/examples/functions/01_basic_oracle/sgx-function/src \
-     ./chains/solana/examples/functions/01_basic_oracle/sgx-function/src/
+COPY ./chains/solana/examples/functions/01_basic_oracle/switchboard-function/src \
+     ./chains/solana/examples/functions/01_basic_oracle/switchboard-function/src/
 
-WORKDIR /home/root/solana-sdk/chains/solana/examples/functions/01_basic_oracle/sgx-function
+WORKDIR /home/root/solana-sdk/chains/solana/examples/functions/01_basic_oracle/switchboard-function
 
 RUN --mount=type=cache,target=/usr/local/cargo/registry,id=${TARGETPLATFORM} --mount=type=cache,target=target,id=${TARGETPLATFORM} \
     cargo build --release && \
     cargo strip && \
-    mv target/release/${CARGO_NAME} /sgx/app
+    mv target/release/basic-oracle-function /sgx/app
 
 FROM switchboardlabs/sgx-function
 

examples/functions/01_basic_oracle/sgx-function/Cargo.toml renamed to examples/functions/01_basic_oracle/switchboard-function/Cargo.toml

@@ -1,22 +1,21 @@
 .PHONY: build clean publish
 
 # Variables
-CARGO_NAME=basic-oracle-function
-DOCKER_IMAGE_NAME=${CONTAINER_NAME}
+DOCKER_IMAGE_NAME ?= gallynaut/basic-oracle-function
 
-DOCKER_BUILD_COMMAND=DOCKER_BUILDKIT=1 docker buildx build --platform linux/amd64 --build-arg CARGO_NAME=${CARGO_NAME}
+DOCKER_BUILD_COMMAND=docker buildx build --platform linux/amd64
 
 # Default make task
 all: build
 
 docker_build:
-	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest --load ../
+	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest ../
 
 docker_publish:
 	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile -t ${DOCKER_IMAGE_NAME}:latest --push ../
 
 dev_docker_build:
-	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile.dev -t ${DOCKER_IMAGE_NAME}:latest --load ../../../../../../
+	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile.dev -t ${DOCKER_IMAGE_NAME}:latest ../../../../../../
 
 dev_docker_publish:
 	${DOCKER_BUILD_COMMAND} --pull -f Dockerfile.dev -t ${DOCKER_IMAGE_NAME}:latest --push ../../../../../../