Skip to content

Commit cc10bd0

Browse files
committed
Merge branch 'pyth-stylus-update-and-initialize' into pyth-stylus-parse-updates
2 parents 2c77720 + de11375 commit cc10bd0

File tree

55 files changed

+1768
-510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1768
-510
lines changed

.github/workflows/ci-starknet-contract.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ jobs:
2727
run: curl https://get.starkli.sh | sh && . ~/.config/.starkli/env && starkliup -v $(awk '/starkli/{print $2}' .tool-versions)
2828
- uses: actions-rust-lang/setup-rust-toolchain@v1
2929
- name: Install Devnet
30-
run: cargo install starknet-devnet --version $(awk '/starknet-devnet/{print $2}' .tool-versions)
30+
# it doesn't build with more recent Rust versions
31+
run: cargo +1.85.0 install starknet-devnet --version $(awk '/starknet-devnet/{print $2}' .tool-versions)
3132
- name: Check formatting
3233
run: scarb fmt --check
3334
- name: Run tests

Cargo.lock

Lines changed: 129 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/argus/src/config.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ impl Default for EscalationPolicyConfig {
159159
impl EscalationPolicyConfig {
160160
pub fn to_policy(&self) -> EscalationPolicy {
161161
EscalationPolicy {
162-
gas_limit_tolerance_pct: self.gas_limit_tolerance_pct,
163-
initial_gas_multiplier_pct: self.initial_gas_multiplier_pct,
164-
gas_multiplier_pct: self.gas_multiplier_pct,
165-
gas_multiplier_cap_pct: self.gas_multiplier_cap_pct,
166162
fee_multiplier_pct: self.fee_multiplier_pct,
167163
fee_multiplier_cap_pct: self.fee_multiplier_cap_pct,
168164
}

0 commit comments

Comments
 (0)