Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into bug/set-range-order-z…
Browse files Browse the repository at this point in the history
…ero-liquidity

* origin/main:
  feat: expose command for broker fee withdrawal (#4581)
  Chore/fix arbitrum deployment (#4570)
  Added Range order pool price to the pool_price_v2 rpc call (#4548)
  fix: just check that the balance after is greater than before (#4587)
  chore: add origin to ccm failed (#4586)
  fix: runtime upgrade state check uses AllPalletsWithoutSystem (#4583)
  chore: add zellic audit to repo (#4585)

# Conflicts:
#	Cargo.lock
  • Loading branch information
syan095 committed Feb 29, 2024
2 parents 7dccae6 + f05ac0f commit 033f31b
Show file tree
Hide file tree
Showing 63 changed files with 1,798 additions and 1,554 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[env]
CF_ETH_CONTRACT_ABI_ROOT = { value = "contract-interfaces/eth-contract-abis", relative = true }
CF_ETH_CONTRACT_ABI_TAG = "v1.0.0"
CF_ETH_CONTRACT_ABI_TAG = "v1.1.2"
CF_SOL_PROGRAM_IDL_ROOT = { value = "contract-interfaces/sol-program-idls", relative = true }
CF_SOL_PROGRAM_IDL_TAG = "v0.1.1"
CF_TEST_CONFIG_ROOT = { value = "engine/config/testing", relative = true }
Expand Down
Loading

0 comments on commit 033f31b

Please sign in to comment.