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]>
switchboard-xyz · Sep 18, 2023 · 7eeab51 · 7eeab51
1 parent a99fe5a
commit 7eeab51
Show file tree

Hide file tree

Showing 88 changed files with 716 additions and 445 deletions.
diff --git a/examples/functions/01_basic_oracle/Cargo.lock b/examples/functions/01_basic_oracle/Cargo.lock
diff --git a/examples/functions/01_basic_oracle/Cargo.toml b/examples/functions/01_basic_oracle/Cargo.toml
@@ -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"
diff --git a/examples/functions/01_basic_oracle/package.json b/examples/functions/01_basic_oracle/package.json
@@ -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",

diff --git a/...s/01_basic_oracle/sgx-function/.gitignore → ...ic_oracle/switchboard-function/.gitignore b/...s/01_basic_oracle/sgx-function/.gitignore → ...ic_oracle/switchboard-function/.gitignore
diff --git a/...s/01_basic_oracle/sgx-function/Cargo.lock → ...ic_oracle/switchboard-function/Cargo.lock b/...s/01_basic_oracle/sgx-function/Cargo.lock → ...ic_oracle/switchboard-function/Cargo.lock
diff --git a/...s/01_basic_oracle/sgx-function/Cargo.toml → ...ic_oracle/switchboard-function/Cargo.toml b/...s/01_basic_oracle/sgx-function/Cargo.toml → ...ic_oracle/switchboard-function/Cargo.toml
@@ -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" }
diff --git a/...s/01_basic_oracle/sgx-function/Dockerfile → ...ic_oracle/switchboard-function/Dockerfile b/...s/01_basic_oracle/sgx-function/Dockerfile → ...ic_oracle/switchboard-function/Dockerfile
@@ -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
 

diff --git a/..._basic_oracle/sgx-function/Dockerfile.dev → ...racle/switchboard-function/Dockerfile.dev b/..._basic_oracle/sgx-function/Dockerfile.dev → ...racle/switchboard-function/Dockerfile.dev
@@ -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
 

diff --git a/...ons/01_basic_oracle/sgx-function/Makefile → ...asic_oracle/switchboard-function/Makefile b/...ons/01_basic_oracle/sgx-function/Makefile → ...asic_oracle/switchboard-function/Makefile
@@ -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 ../../../../../../

diff --git a/...01_basic_oracle/sgx-function/package.json → ..._oracle/switchboard-function/package.json b/...01_basic_oracle/sgx-function/package.json → ..._oracle/switchboard-function/package.json
diff --git a/..._basic_oracle/sgx-function/src/binance.rs → ...racle/switchboard-function/src/binance.rs b/..._basic_oracle/sgx-function/src/binance.rs → ...racle/switchboard-function/src/binance.rs
diff --git a/.../01_basic_oracle/sgx-function/src/main.rs → ...c_oracle/switchboard-function/src/main.rs b/.../01_basic_oracle/sgx-function/src/main.rs → ...c_oracle/switchboard-function/src/main.rs
diff --git a/examples/functions/02_liquidity_oracle/Cargo.lock b/examples/functions/02_liquidity_oracle/Cargo.lock
diff --git a/examples/functions/02_liquidity_oracle/Cargo.toml b/examples/functions/02_liquidity_oracle/Cargo.toml
@@ -19,8 +19,8 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-switchboard-solana = "0.28.4"
-# switchboard-solana = { version = "0.28.4", path = "../../../rust/switchboard-solana" }
+switchboard-solana = "0.28.19"
+# switchboard-solana = { version = "0.28.19", path = "../../../rust/switchboard-solana" }
 bytemuck = "^1"
 anchor-lang = { version = "0.28.0", features = [
   "init-if-needed",

diff --git a/examples/functions/02_liquidity_oracle/sgx-function/Dockerfile.dev b/examples/functions/02_liquidity_oracle/sgx-function/Dockerfile.dev
diff --git a/examples/functions/02_liquidity_oracle/src/actions/trigger_function.rs b/examples/functions/02_liquidity_oracle/src/actions/trigger_function.rs
@@ -21,7 +21,7 @@ pub struct TriggerFunction<'info> {
 }
 
 #[derive(Clone, AnchorSerialize, AnchorDeserialize)]
-pub struct TriggerFunctionParams { }
+pub struct TriggerFunctionParams {}
 
 impl TriggerFunction<'_> {
     pub fn validate(
@@ -32,12 +32,16 @@ impl TriggerFunction<'_> {
         Ok(())
     }
 
-    pub fn actuate(ctx: &Context<Self>, _params: &TriggerFunctionParams) -> anchor_lang::Result<()> {
+    pub fn actuate(
+        ctx: &Context<Self>,
+        _params: &TriggerFunctionParams,
+    ) -> anchor_lang::Result<()> {
         FunctionTrigger {
-            function: ctx.accounts.function.clone(),
-            authority: ctx.accounts.authority.clone(),
-            attestation_queue: ctx.accounts.attestation_queue.clone(),
-        }.invoke(ctx.accounts.attestation_program.clone())?;
+            function: ctx.accounts.function.to_account_info(),
+            authority: ctx.accounts.authority.to_account_info(),
+            attestation_queue: ctx.accounts.attestation_queue.to_account_info(),
+        }
+        .invoke(ctx.accounts.attestation_program.clone())?;
         Ok(())
     }
-}
+}
diff --git a/..._liquidity_oracle/sgx-function/.gitignore → ...ty_oracle/switchboard-function/.gitignore b/..._liquidity_oracle/sgx-function/.gitignore → ...ty_oracle/switchboard-function/.gitignore
diff --git a/..._liquidity_oracle/sgx-function/Cargo.lock → ...ty_oracle/switchboard-function/Cargo.lock b/..._liquidity_oracle/sgx-function/Cargo.lock → ...ty_oracle/switchboard-function/Cargo.lock
diff --git a/...03_candles_oracle/sgx-function/Cargo.toml → ...ty_oracle/switchboard-function/Cargo.toml b/...03_candles_oracle/sgx-function/Cargo.toml → ...ty_oracle/switchboard-function/Cargo.toml
@@ -16,7 +16,7 @@ futures = "0.3"
 serde = "^1"
 serde_json = "^1"
 switchboard-utils = { version = "0.8.0" }
-switchboard-solana = "0.28.4"
-# switchboard-solana = { version = "0.28.4", path = "../../../../rust/switchboard-solana" }
+switchboard-solana = "0.28.19"
+# switchboard-solana = { version = "0.28.19", path = "../../../../rust/switchboard-solana" }
 bytemuck = "1.13.1"
 rust_decimal = "1.30.0"
diff --git a/..._liquidity_oracle/sgx-function/Dockerfile → ...ty_oracle/switchboard-function/Dockerfile b/..._liquidity_oracle/sgx-function/Dockerfile → ...ty_oracle/switchboard-function/Dockerfile
@@ -8,13 +8,13 @@ WORKDIR /home/root/switchboard-function
 COPY ./Anchor.toml ./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=target=/home/root/.cargo/git,type=cache \
     --mount=target=/home/root/.cargo/registry,type=cache \
-    --mount=type=cache,target=/home/root/switchboard-function/sgx-function/target \
+    --mount=type=cache,target=/home/root/switchboard-function/switchboard-function/target \
     cargo build --release && \
     cargo strip && \
     mv target/release/basic-oracle-function /sgx/app

diff --git a/...andles_oracle/sgx-function/Dockerfile.dev → ...racle/switchboard-function/Dockerfile.dev b/...andles_oracle/sgx-function/Dockerfile.dev → ...racle/switchboard-function/Dockerfile.dev
@@ -13,25 +13,25 @@ COPY ./examples/functions/01_basic_oracle/Cargo.toml \
      ./examples/functions/01_basic_oracle/Cargo.lock \
      ./examples/functions/01_basic_oracle/
 
-COPY ./examples/functions/01_basic_oracle/sgx-function/Cargo.toml \
-     ./examples/functions/01_basic_oracle/sgx-function/Cargo.lock \
-     ./examples/functions/01_basic_oracle/sgx-function/
+COPY ./examples/functions/01_basic_oracle/switchboard-function/Cargo.toml \
+     ./examples/functions/01_basic_oracle/switchboard-function/Cargo.lock \
+     ./examples/functions/01_basic_oracle/switchboard-function/
 
 COPY ./rust/switchboard-solana/src \
      ./rust/switchboard-solana/src/
 
 COPY ./examples/functions/01_basic_oracle/src \
      ./examples/functions/01_basic_oracle/src/
 
-COPY ./examples/functions/01_basic_oracle/sgx-function/src \
-     ./examples/functions/01_basic_oracle/sgx-function/src/
+COPY ./examples/functions/01_basic_oracle/switchboard-function/src \
+     ./examples/functions/01_basic_oracle/switchboard-function/src/
 
-WORKDIR /home/root/solana-sdk/examples/functions/01_basic_oracle/sgx-function
+WORKDIR /home/root/solana-sdk/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 /home/root/solana-sdk/examples/functions/01_basic_oracle/sgx-function/target/release/${CARGO_NAME} /sgx
+    mv /home/root/solana-sdk/examples/functions/01_basic_oracle/switchboard-function/target/release/${CARGO_NAME} /sgx
 
 FROM switchboardlabs/sgx-function
 

diff --git a/...02_liquidity_oracle/sgx-function/Makefile → ...dity_oracle/switchboard-function/Makefile b/...02_liquidity_oracle/sgx-function/Makefile → ...dity_oracle/switchboard-function/Makefile
diff --git a/...iquidity_oracle/sgx-function/package.json → ..._oracle/switchboard-function/package.json b/...iquidity_oracle/sgx-function/package.json → ..._oracle/switchboard-function/package.json
diff --git a/...uidity_oracle/sgx-function/src/binance.rs → ...racle/switchboard-function/src/binance.rs b/...uidity_oracle/sgx-function/src/binance.rs → ...racle/switchboard-function/src/binance.rs
diff --git a/...idity_oracle/sgx-function/src/bitfinex.rs → ...acle/switchboard-function/src/bitfinex.rs b/...idity_oracle/sgx-function/src/bitfinex.rs → ...acle/switchboard-function/src/bitfinex.rs
diff --git a/...idity_oracle/sgx-function/src/coinbase.rs → ...acle/switchboard-function/src/coinbase.rs b/...idity_oracle/sgx-function/src/coinbase.rs → ...acle/switchboard-function/src/coinbase.rs
diff --git a/...quidity_oracle/sgx-function/src/kraken.rs → ...oracle/switchboard-function/src/kraken.rs b/...quidity_oracle/sgx-function/src/kraken.rs → ...oracle/switchboard-function/src/kraken.rs
diff --git a/...liquidity_oracle/sgx-function/src/main.rs → ...y_oracle/switchboard-function/src/main.rs b/...liquidity_oracle/sgx-function/src/main.rs → ...y_oracle/switchboard-function/src/main.rs
diff --git a/examples/functions/03_candles_oracle/Cargo.lock b/examples/functions/03_candles_oracle/Cargo.lock