diff --git a/apps/fortuna/Cargo.toml b/apps/fortuna/Cargo.toml index 082cc7ec87..df333d134b 100644 --- a/apps/fortuna/Cargo.toml +++ b/apps/fortuna/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fortuna" -version = "9.4.0" +version = "9.4.1" edition = "2021" [lib] diff --git a/apps/fortuna/src/history.rs b/apps/fortuna/src/history.rs index af00b58a70..c9dab3e680 100644 --- a/apps/fortuna/src/history.rs +++ b/apps/fortuna/src/history.rs @@ -3,7 +3,7 @@ use { anyhow::Result, chrono::DateTime, ethers::{ - core::utils::hex::ToHex, + core::utils::hex::ToHexExt, prelude::TxHash, types::{Address, Bytes, U256}, utils::keccak256, diff --git a/lazer/contracts/cardano/sdk/js/package.json b/lazer/contracts/cardano/sdk/js/package.json index e13f03d995..a4cd9de4ff 100644 --- a/lazer/contracts/cardano/sdk/js/package.json +++ b/lazer/contracts/cardano/sdk/js/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "@evolution-sdk/evolution": "^0.3.29" + "@evolution-sdk/evolution": "0.3.28" }, "description": "User-facing SDK for the Pyth Lazer Cardano integration", "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6e655751f7..c9daf7cf8d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1937,8 +1937,8 @@ importers: lazer/contracts/cardano/sdk/js: dependencies: '@evolution-sdk/evolution': - specifier: ^0.3.29 - version: 0.3.32(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(utf-8-validate@6.0.6) + specifier: 0.3.28 + version: 0.3.28(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(utf-8-validate@6.0.6) devDependencies: '@cprussin/tsconfig': specifier: 'catalog:' @@ -6215,9 +6215,6 @@ packages: '@evolution-sdk/evolution@0.3.28': resolution: {integrity: sha512-rgB7bswriAQeLcLSq+HT+nAugsmgdHor9skk6nT9ewTgk1fP9Wq55AxH118Jb5gFAnST40GGEh9SJfswpOeDTg==} - '@evolution-sdk/evolution@0.3.32': - resolution: {integrity: sha512-D0PZgkW55V1sPmul+WbdWNDon7aN8s4+SXuKAkJBRsHVbMvpvrM2doQwSCjQ1cB4zrW9LQGlLKt2SpGdAtLrLQ==} - '@evolution-sdk/scalus-uplc@0.0.9': resolution: {integrity: sha512-ByC7I00NmgTUEhC3ZFr+wjFCAmZrKuV5yE5l4naHf9EhkYLgPVOM+NokLhb2j+CyXuOCB7ePvlcoidFkAJ/DiQ==} peerDependencies: @@ -29276,25 +29273,6 @@ snapshots: - bufferutil - utf-8-validate - '@evolution-sdk/evolution@0.3.32(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(utf-8-validate@6.0.6)': - dependencies: - '@effect/platform': 0.90.10(effect@3.19.19) - '@effect/platform-node': 0.96.1(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(effect@3.19.19)(utf-8-validate@6.0.6) - '@noble/curves': 2.0.1 - '@noble/hashes': 1.8.0 - '@scure/base': 1.2.6 - '@scure/bip32': 1.7.0 - '@scure/bip39': 1.6.0 - '@types/bip39': 3.0.4 - bip39: 3.1.0 - effect: 3.19.19 - transitivePeerDependencies: - - '@effect/cluster' - - '@effect/rpc' - - '@effect/sql' - - bufferutil - - utf-8-validate - '@evolution-sdk/scalus-uplc@0.0.9(@evolution-sdk/evolution@0.3.28(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(utf-8-validate@6.0.6))': dependencies: '@evolution-sdk/evolution': 0.3.28(@effect/cluster@0.48.16(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/workflow@0.9.6(@effect/platform@0.90.10(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(effect@3.19.19))(@effect/rpc@0.69.5(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(@effect/sql@0.44.2(@effect/experimental@0.54.6(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19)(ioredis@5.10.0))(@effect/platform@0.90.10(effect@3.19.19))(effect@3.19.19))(bufferutil@4.1.0)(utf-8-validate@6.0.6) diff --git a/pythnet/pythnet_sdk/Cargo.toml b/pythnet/pythnet_sdk/Cargo.toml index bf3ea2c03f..a40cb0175d 100644 --- a/pythnet/pythnet_sdk/Cargo.toml +++ b/pythnet/pythnet_sdk/Cargo.toml @@ -42,6 +42,7 @@ base64 = "0.21.0" rand = "0.7.0" serde_json = "1.0.96" solana-client = ">=1.13.6" +solana-program = ">=1.13.6" solana-sdk = ">=1.13.6" proptest = "1.1.0" diff --git a/pythnet/pythnet_sdk/examples/generate_pyth_data.rs b/pythnet/pythnet_sdk/examples/generate_pyth_data.rs index 838e6846d7..c157438b88 100644 --- a/pythnet/pythnet_sdk/examples/generate_pyth_data.rs +++ b/pythnet/pythnet_sdk/examples/generate_pyth_data.rs @@ -6,6 +6,7 @@ use { pythnet_sdk::pythnet::PYTH_PID, serde_json::json, solana_client::rpc_client::RpcClient, + solana_program::system_program, solana_sdk::pubkey::Pubkey, std::{io::Write, str::FromStr}, }; @@ -113,7 +114,7 @@ fn main() { for i in 0..10_000u32 { let (accumulator_account, _) = Pubkey::find_program_address( &[b"AccumulatorState", &PYTH_PID, &i.to_be_bytes()], - &solana_sdk::system_program::id(), + &system_program::id(), ); file.write_all(format!("{accumulator_account}\n").as_bytes()) .unwrap(); diff --git a/target_chains/cosmwasm/contracts/pyth/src/state.rs b/target_chains/cosmwasm/contracts/pyth/src/state.rs index bd1563fde8..0e117aad65 100644 --- a/target_chains/cosmwasm/contracts/pyth/src/state.rs +++ b/target_chains/cosmwasm/contracts/pyth/src/state.rs @@ -47,19 +47,19 @@ pub struct ConfigInfo { pub fee: Coin, } -pub fn config(storage: &mut dyn Storage) -> Singleton { +pub fn config(storage: &mut dyn Storage) -> Singleton<'_, ConfigInfo> { singleton(storage, CONFIG_KEY) } -pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton { +pub fn config_read(storage: &dyn Storage) -> ReadonlySingleton<'_, ConfigInfo> { singleton_read(storage, CONFIG_KEY) } -pub fn price_feed_bucket(storage: &mut dyn Storage) -> Bucket { +pub fn price_feed_bucket(storage: &mut dyn Storage) -> Bucket<'_, PriceFeed> { bucket(storage, PRICE_FEED_KEY) } -pub fn price_feed_read_bucket(storage: &dyn Storage) -> ReadonlyBucket { +pub fn price_feed_read_bucket(storage: &dyn Storage) -> ReadonlyBucket<'_, PriceFeed> { bucket_read(storage, PRICE_FEED_KEY) }