Эх сурвалжийг харах

[solana-receiver-cli] Add logic to receive VAAs with the new Wormhole receiver (#1184)

* Checkpoint

* Checkpoint

* Cleanup

* More cleanup

* Cleanup

* Should work

* Rename

* New receiver post-vaa

* Rename legacy

* Checkpoint

* ADd compute units

* Revert htis file

* Rename

* Comments
guibescos 1 жил өмнө
parent
commit
7bf41c40e6

+ 49 - 2
target_chains/solana/Cargo.lock

@@ -690,7 +690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
  "borsh-derive 0.10.3",
- "hashbrown 0.13.2",
+ "hashbrown 0.12.3",
 ]
 
 [[package]]
@@ -3073,6 +3073,7 @@ dependencies = [
  "anchor-client",
  "anyhow",
  "base64 0.13.1",
+ "borsh 0.9.3",
  "byteorder",
  "cfg-if",
  "clap 3.2.23",
@@ -3084,8 +3085,8 @@ dependencies = [
  "shellexpand",
  "solana-client",
  "solana-sdk",
- "wormhole-anchor-sdk",
  "wormhole-core",
+ "wormhole-core-bridge-solana",
  "wormhole-sdk",
  "wormhole-solana",
 ]
@@ -3457,6 +3458,22 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "ruint"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77e1574d439643c8962edf612a888e7cc5581bcdf36cb64e6bc88466b03b2daa"
+dependencies = [
+ "ruint-macro",
+ "thiserror",
+]
+
+[[package]]
+name = "ruint-macro"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e666a5496a0b2186dbcd0ff6106e29e093c15591bde62c20d3842007c6978a09"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.22"
@@ -6233,6 +6250,36 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "wormhole-core-bridge-solana"
+version = "0.0.1-alpha.3"
+source = "git+https://github.com/guibescos/wormhole?branch=variable-sigs#84ddd45906abf14f1e0ac3b80556c15904301fb6"
+dependencies = [
+ "anchor-lang",
+ "cfg-if",
+ "hex",
+ "ruint",
+ "solana-program",
+ "wormhole-io",
+ "wormhole-raw-vaas",
+]
+
+[[package]]
+name = "wormhole-io"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4965f46f7a99debe3c2cf9337c6e3eb7068da348aecf074a3e35686937f25c65"
+
+[[package]]
+name = "wormhole-raw-vaas"
+version = "0.0.1-alpha.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cb59754ad91d99c0e3d7d159fffcbb4087c18a1c13b1b2a945775635ef9bd03"
+dependencies = [
+ "ruint",
+ "ruint-macro",
+]
+
 [[package]]
 name = "wormhole-sdk"
 version = "0.1.0"

+ 4 - 3
target_chains/solana/cli/Cargo.toml

@@ -5,8 +5,8 @@ edition = "2021"
 
 [features]
 default = ["mainnet"]
-mainnet = ["wormhole-anchor-sdk/mainnet", "pyth-solana-receiver/mainnet"]
-devnet = ["wormhole-anchor-sdk/solana-devnet", "pyth-solana-receiver/devnet"]
+mainnet = ["pyth-solana-receiver/mainnet"]
+devnet = ["pyth-solana-receiver/devnet"]
 
 
 [dependencies]
@@ -25,6 +25,7 @@ byteorder = "1.4.3"
 serde = "1.0.152"
 wormhole-sdk = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1" }
 serde_wormhole = { git = "https://github.com/wormhole-foundation/wormhole", tag = "v2.17.1"}
-wormhole-anchor-sdk = {  version = "0.1.0-alpha.2" , default-features = false }
 cfg-if = "1.0.0"
 hex = "0.4.3"
+borsh = "0.9.3" # Old version of borsh needed for wormhole-solana
+wormhole-core-bridge-solana = {git = "https://github.com/guibescos/wormhole", branch = "variable-sigs"}

+ 4 - 4
target_chains/solana/cli/src/cli.rs

@@ -35,10 +35,10 @@ pub struct Cli {
 
 #[derive(Subcommand, Debug)]
 pub enum Action {
-    #[clap(about = "Verify, post and receive the price VAA on solana")]
-    PostAndReceiveVAA {
-        #[clap(short = 'v', long, help = "Price VAA from Pythnet")]
-        vaa: String,
+    #[clap(about = "Post a price update from Hermes to Solana")]
+    PostPriceUpdate {
+        #[clap(short = 'p', long, help = "Payload from Hermes")]
+        payload: String,
     },
     #[clap(
         about = "Initialize a wormhole receiver contract by sequentially replaying the guardian set updates"

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 17 - 13
target_chains/solana/cli/src/main.rs


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно