Skip to content
Merged
Show file tree
Hide file tree
Changes from 82 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
84a5d3f
chore(deps): bump scarb to 2.9.2
0xSacha Jan 10, 2025
0e77608
refactor: adapt contract methods to cairo 2.9.2
0xSacha Jan 10, 2025
7ae2c7a
test: update test suite for snforge 0.34.0
0xSacha Jan 10, 2025
e228144
feat(crates): bump edition
0xSacha Jan 15, 2025
82a5d25
fix standart_hook_metadata::format_metadata-Bytes size
EgeCaner Jan 30, 2025
bbc9d92
remove comment
EgeCaner Jan 30, 2025
2c5977f
MockMailbox: hook_metadata + message_body size check
EgeCaner Jan 30, 2025
cdacb6a
Merge pull request #1 from aroralanuk/hook-metadata-fix
aroralanuk Feb 6, 2025
8cd4a24
fix: format code
JordyRo1 Feb 11, 2025
888aec6
Merge branch 'main' into pr/126
JordyRo1 Feb 11, 2025
5032032
Merge branch 'main' into pr/126
JordyRo1 Feb 11, 2025
f4b6978
fix: format code
JordyRo1 Feb 11, 2025
6e1ab87
fix(ci): version
JordyRo1 Feb 11, 2025
109f2a2
StandartHookMetadata construction fix
EgeCaner Feb 12, 2025
d73eecd
fix require_hook zero address check
EgeCaner Feb 13, 2025
29fd5f1
Mailbox: Zero address check for setters
EgeCaner Feb 13, 2025
83a814a
Mailbox: Zero address handling for custom_hook alongside Option::None
EgeCaner Feb 14, 2025
117a597
MockMailbox Zero Address handling for custom hook
EgeCaner Feb 14, 2025
efc93c9
Merge remote-tracking branch 'remotes/ege/main'
aroralanuk Feb 19, 2025
795a08e
Update to snforge 0.38.3
amanusk Mar 18, 2025
2d8317f
Update to 2.11.2
amanusk Mar 18, 2025
2e116e5
Update to 2.10.1
amanusk Mar 18, 2025
da2d5cc
Update CI to 2.10
amanusk Mar 18, 2025
375f87e
Update more CI
amanusk Mar 18, 2025
be2dfc1
update xerc to 2.10
amanusk Mar 18, 2025
4143126
add metadata test
amanusk Mar 18, 2025
1d0928e
Merge branch 'main' into aggregation_verify
aroralanuk Mar 25, 2025
3cc5c36
toolversion
aroralanuk Mar 25, 2025
bac5854
deploy at specific address
aroralanuk Mar 25, 2025
b895734
test works
aroralanuk Mar 26, 2025
e0e8282
fmt
aroralanuk Mar 26, 2025
a683467
fails
aroralanuk Mar 29, 2025
d975fb6
some test fixes
aroralanuk Apr 7, 2025
e6c19e7
fix the hook config test
aroralanuk Apr 7, 2025
0d9ad8d
fix some warnings
aroralanuk Apr 7, 2025
e434a62
warnings fix
aroralanuk Apr 8, 2025
1fe072c
Merge branch 'hyperlane/main' into 2.10.1-update
aroralanuk Apr 8, 2025
f556a1d
fmt
aroralanuk Apr 8, 2025
ffdb8d6
add codeowners
aroralanuk Apr 8, 2025
55ad4c5
Merge pull request #3 from hyperlane-xyz/feat/add-codeowners
aroralanuk Apr 8, 2025
debc7f3
Merge branch 'main' into 2.10.1-update
aroralanuk Apr 8, 2025
744eeca
update cainome and starknet-rs
aroralanuk Apr 8, 2025
3cc804d
felt
aroralanuk Apr 8, 2025
47991cb
add Debug attribute
aroralanuk Apr 8, 2025
82b1935
Merge branch '2.10.1-update' into aggregation_verify
aroralanuk Apr 8, 2025
d8d6f7a
import resolution oz
aroralanuk Apr 9, 2025
189aaa6
add serde
aroralanuk Apr 9, 2025
2759312
change ci
aroralanuk Apr 9, 2025
12b3766
back to test
aroralanuk Apr 9, 2025
813f9f3
test actually checks now
aroralanuk Apr 9, 2025
1b6f845
fix test
aroralanuk Apr 9, 2025
4cc0422
update account addresses
aroralanuk Apr 21, 2025
84d4707
starknet-devnet switch
aroralanuk Apr 21, 2025
9df96de
Update devnet accounts and chain_id
amanusk Apr 22, 2025
e34ce04
random salts
aroralanuk Apr 22, 2025
1be6d5d
in bg
aroralanuk Apr 22, 2025
1f5351c
pkill
aroralanuk Apr 22, 2025
f3c7520
separate tests
aroralanuk Apr 22, 2025
7eda841
Merge pull request #1 from hyperlane-xyz/2.10.1-update
aroralanuk Apr 22, 2025
a57faeb
Merge branch '2.10.1-update' into aggregation_verify
aroralanuk Apr 22, 2025
59078d4
rm TODO
aroralanuk Apr 22, 2025
8c36c3f
Merge branch 'main' into aggregation_verify
aroralanuk Apr 22, 2025
39a1c71
update codeowners
aroralanuk May 15, 2025
088baca
Merge branch 'reorg-2.10.1-update' into aggregation_verify
aroralanuk May 15, 2025
7df57bf
chore: address comments on PR#2 (#10)
aroralanuk May 15, 2025
e2cbfcd
update codeowners
aroralanuk May 15, 2025
ef42feb
Merge branch 'reorg-2.10.1-update' into reorg-aggregation-verify
aroralanuk May 15, 2025
26294c1
update with yorke's comments remediations
aroralanuk May 15, 2025
4de0d9c
getters functions
aroralanuk May 15, 2025
e750e75
fmt
aroralanuk May 16, 2025
271ecc2
Merge branch 'reorg-aggregation-verify' into reorg-dex-collateral-dep…
aroralanuk May 16, 2025
ef36f43
Merge branch 'reorg-aggregation-verify' into reorg-getters
aroralanuk May 16, 2025
21deb1d
decimals()
aroralanuk May 19, 2025
6310622
add scaling
aroralanuk May 20, 2025
28f8a38
fmt
aroralanuk May 20, 2025
24e1565
no scaling on way back
aroralanuk May 21, 2025
14d340f
fmt
aroralanuk May 21, 2025
f14b85a
conversion
aroralanuk May 21, 2025
345f8d2
use dispatcher for deposit
aroralanuk May 21, 2025
a2566ae
use decimals
aroralanuk May 21, 2025
c96d59c
decimals constructor
aroralanuk May 21, 2025
14cf40f
Merge branch 'reorg-dex-collateral-deposit' into reorg-getters
aroralanuk May 21, 2025
f5639c7
Merge branch 'reorg' into reorg-getters
aroralanuk May 29, 2025
1e1a470
reverse
aroralanuk May 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @nambrot @yorhodes @aroralanuk
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.6.5"
scarb-version: "2.10.1"
- name: Build contracts
working-directory: ${{ env.working-directory}}
run: scarb build
Expand Down
27 changes: 9 additions & 18 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.6.5"
scarb-version: "2.10.1"

- name: Build contracts
run: |
Expand All @@ -28,34 +28,25 @@ jobs:
run: |
cd rust && cargo build --release

- name: Install dojoup
- name: Install starknet-devnet
run: |
curl -L https://install.dojoengine.org | bash

- name: Install dojo
run: |-
/home/runner/.config/.dojo/bin/dojoup -v 0.7.0-alpha.2
sudo mv /home/runner/.config/.dojo/bin/katana /usr/local/bin/
cargo install starknet-devnet --locked

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Run katana
- name: Run starknet-devnet
run: |
katana -b 1000 &
starknet-devnet --seed 0 &

- name: Run evm -> strk test
run: |
cd rust && cargo test -- test_mailbox_evm_to_strk

- name: Kill katana
run: |
pkill katana

- name: run katana
run: |
katana -b 1000 &

- name: Run strk -> evm test
run: |
cd rust && cargo test -- test_mailbox_strk_to_evm

- name: Kill starknet-devnet
run: |
pkill starknet-devnet
14 changes: 7 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest
env:
working-directory: ./cairo
SCARB_VERSION: "2.6.5"
SNFOUNDRY_VERSION: "0.22.0"
SCARB_VERSION: "2.10.1"
SNFOUNDRY_VERSION: "0.38.3"
steps:
- uses: actions/checkout@v3

- uses: software-mansion/setup-scarb@v1
with:
scarb-version: ${{ env.SCARB_VERSION }}

- uses: foundry-rs/setup-snfoundry@v3
- uses: foundry-rs/setup-snfoundry@v4
with:
starknet-foundry-version: ${{ env.SNFOUNDRY_VERSION }}

Expand All @@ -45,16 +45,16 @@ jobs:
runs-on: ubuntu-latest
env:
working-directory: ./xerc20
SCARB_VERSION: "2.9.2"
SNFOUNDRY_VERSION: "0.34.0"
SCARB_VERSION: "2.10.1"
SNFOUNDRY_VERSION: "0.38.3"
steps:
- uses: actions/checkout@v3

- uses: software-mansion/setup-scarb@v1
with:
scarb-version: ${{ env.SCARB_VERSION }}

- uses: foundry-rs/setup-snfoundry@v3
- uses: foundry-rs/setup-snfoundry@v4
with:
starknet-foundry-version: ${{ env.SNFOUNDRY_VERSION }}

Expand All @@ -75,4 +75,4 @@ jobs:

- name: Test
working-directory: ${{ env.working-directory }}
run: snforge test
run: snforge test
2 changes: 1 addition & 1 deletion .github/workflows/token-ext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
- uses: actions/checkout@v4
- uses: software-mansion/setup-scarb@v1
with:
scarb-version: "2.6.5"
scarb-version: "2.10.1"
- run: cd cairo && scarb fmt --check
- run: cd cairo && scarb build
4 changes: 2 additions & 2 deletions cairo/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
scarb 2.6.5
starknet-foundry 0.22.0
scarb 2.10.1
starknet-foundry 0.38.3
188 changes: 143 additions & 45 deletions cairo/Scarb.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,66 +3,39 @@ version = 1

[[package]]
name = "alexandria_bytes"
version = "0.1.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
version = "0.4.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:59ef1ddc05d533f7e189c29090ec287e487572b2bdd1e7977720518c8ad42d98"
dependencies = [
"alexandria_data_structures",
"alexandria_math",
]

[[package]]
name = "alexandria_data_structures"
version = "0.2.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
dependencies = [
"alexandria_encoding",
]

[[package]]
name = "alexandria_encoding"
version = "0.1.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
dependencies = [
"alexandria_bytes",
"alexandria_math",
"alexandria_numeric",
]
version = "0.4.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:72bdee057923061f6719c82ac9d92c9c9bb39f3fbb9c369f64aa9e6d5b0b2425"

[[package]]
name = "alexandria_math"
version = "0.2.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
dependencies = [
"alexandria_data_structures",
]

[[package]]
name = "alexandria_numeric"
version = "0.1.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
dependencies = [
"alexandria_math",
"alexandria_searching",
]

[[package]]
name = "alexandria_searching"
version = "0.1.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
dependencies = [
"alexandria_data_structures",
]
version = "0.4.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:0ad256055661ed5b29ccef7bddbb44136995641cf537a6b259b94b6b6df14133"

[[package]]
name = "alexandria_storage"
version = "0.3.0"
source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=bcdca70#bcdca70afdf59c9976148e95cebad5cf63d75a7f"
version = "0.4.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:66df98d459d637273121baad2fe8615c29a7c5d3db2a34b4ce7c3555ebf24725"

[[package]]
name = "contracts"
version = "0.0.6"
dependencies = [
"alexandria_bytes",
"alexandria_data_structures",
"alexandria_math",
"alexandria_storage",
"mocks",
"openzeppelin",
Expand All @@ -74,21 +47,146 @@ name = "mocks"
version = "0.0.6"
dependencies = [
"alexandria_bytes",
"alexandria_data_structures",
"alexandria_storage",
"contracts",
"openzeppelin",
"snforge_std",
"token",
]

[[package]]
name = "openzeppelin"
version = "0.14.0"
source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.14.0#f091c4f51ddeb10297db984acae965328c5a4e5b"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:05fd9365be85a4a3e878135d5c52229f760b3861ce4ed314cb1e75b178b553da"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_finance",
"openzeppelin_governance",
"openzeppelin_introspection",
"openzeppelin_merkle_tree",
"openzeppelin_presets",
"openzeppelin_security",
"openzeppelin_token",
"openzeppelin_upgrades",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_access"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:7734901a0ca7a7065e69416fea615dd1dc586c8dc9e76c032f25ee62e8b2a06c"
dependencies = [
"openzeppelin_introspection",
]

[[package]]
name = "openzeppelin_account"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:1aa3a71e2f40f66f98d96aa9bf9f361f53db0fd20fa83ef7df04426a3c3a926a"
dependencies = [
"openzeppelin_introspection",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_finance"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:f0c507fbff955e4180ea3fa17949c0ff85518c40101f4948948d9d9a74143d6c"
dependencies = [
"openzeppelin_access",
"openzeppelin_token",
]

[[package]]
name = "openzeppelin_governance"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:c0fb60fad716413d537fabd5fcbb2c499ca6beb95af5f0d1699955ecec4c6f63"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_introspection",
"openzeppelin_token",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_introspection"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:13e04a2190684e6804229a77a6c56de7d033db8b9ef519e5e8dee400a70d8a3d"

[[package]]
name = "openzeppelin_merkle_tree"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:039608900e92f3dcf479bf53a49a1fd76452acd97eb86e390d1eb92cacdaf3af"

[[package]]
name = "openzeppelin_presets"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:5c07a8de32e5d9abe33988c7927eaa8b5f83bc29dc77302d9c8c44c898611042"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_finance",
"openzeppelin_introspection",
"openzeppelin_token",
"openzeppelin_upgrades",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_security"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:27155597019ecf971c48d7bfb07fa58cdc146d5297745570071732abca17f19f"

[[package]]
name = "openzeppelin_token"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:4452f449dc6c1ea97cf69d1d9182749abd40e85bd826cd79652c06a627eafd91"
dependencies = [
"openzeppelin_access",
"openzeppelin_account",
"openzeppelin_introspection",
"openzeppelin_utils",
]

[[package]]
name = "openzeppelin_upgrades"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:15fdd63f6b50a0fda7b3f8f434120aaf7637bcdfe6fd8d275ad57343d5ede5e1"

[[package]]
name = "openzeppelin_utils"
version = "0.20.0"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:44f32d242af1e43982decc49c563e613a9b67ade552f5c3d5cde504e92f74607"

[[package]]
name = "snforge_scarb_plugin"
version = "0.38.3"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:0cd914b547acd96b4cad99a78e95c0eda001d0c280da4969b2161e286079cf46"

[[package]]
name = "snforge_std"
version = "0.22.0"
source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.22.0#9b215944c6c5871c738381b4ded61bbf06e7ba35"
version = "0.38.3"
source = "registry+https://scarbs.xyz/"
checksum = "sha256:d376526fbbe22535ad89ed630b11d6e209f22c50168de6c6430c0591c81c3174"
dependencies = [
"snforge_scarb_plugin",
]

[[package]]
name = "token"
Expand Down
29 changes: 22 additions & 7 deletions cairo/Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,34 @@ members = ["crates/*"]
name = "hyperlane_starknet"
description = "Implementation of the Hyperlane protocol on Starknet."
version = "0.0.6"
edition = "2023_11"
cairo-version = "2.6.3"
edition = "2024_07"
cairo-version = "2.10.1"
scarb-version = "2.10.1"
license-file = "../LICENSE"
readme = "../README.md"

# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html

[workspace.dependencies]
starknet = "2.6.3"
alexandria_bytes = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "bcdca70" }
alexandria_storage = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "bcdca70" }
openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.14.0" }
array = "0.4.0"
assert_macros = "2.10.1"
starknet = "2.10.1"
alexandria_bytes = "0.4.0"
alexandria_storage = "0.4.0"
alexandria_data_structures = "0.4.0"
alexandria_math = "0.4.0"
openzeppelin = "0.20.0"
snforge_std = "0.38.3"
snforge_scarb_plugin = "0.38.3"

[dev-dependencies]
snforge_std.workspace = true

[workspace.tool.fmt]
sort-module-level-items = true
sort-module-level-items = true

[scripts]
test = "snforge test"

[workspace.tool.scarb]
allow-prebuilt-plugins = ["snforge_std"]
Loading
Loading