Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update .gitmodules #87

Merged
merged 3 commits into from
Aug 29, 2024
Merged

update .gitmodules #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49f6130
uptick rev
a5-pickle Aug 29, 2024
ba248de
solana: uptick anchor 0.30.1
a5-pickle Aug 29, 2024
4dae105
solana: fix `make lint`
a5-pickle Aug 29, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: bash sh/run_test.sh
runs-on: ubuntu-latest
# Anchor Docker image: https://www.anchor-lang.com/docs/verifiable-builds#images
# container: backpackapp/build:v0.30.0
# container: backpackapp/build:v0.30.1
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -25,7 +25,7 @@ jobs:
with:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.0"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
- name: make node_modules
Expand All @@ -35,4 +35,4 @@ jobs:
working-directory: ./evm
- name: bash sh/run_test.sh
run: bash sh/run_test.sh
working-directory: ./e2e
working-directory: ./e2e
8 changes: 2 additions & 6 deletions .github/workflows/solana.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ jobs:
make-anchor-test:
name: make anchor-test
runs-on: ubuntu-latest
# Anchor Docker image: https://www.anchor-lang.com/docs/verifiable-builds#images
# container: backpackapp/build:v0.30.0
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -57,7 +55,7 @@ jobs:
with:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.0"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
working-directory: ./solana
Expand All @@ -68,8 +66,6 @@ jobs:
make-check-build:
name: make check-build
runs-on: ubuntu-latest
# Anchor Docker image: https://www.anchor-lang.com/docs/verifiable-builds#images
# container: backpackapp/build:v0.30.0
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -82,7 +78,7 @@ jobs:
with:
node-version: "20.11.0"
solana-cli-version: "1.18.15"
anchor-version: "0.30.0"
anchor-version: "0.30.1"
- name: Set default Rust toolchain
run: rustup default stable
working-directory: ./solana
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "lib/example-liquidity-layer"]
path = lib/example-liquidity-layer
url = https://github.com/wormhole-foundation/example-liquidity-layer.git
rev = 63f2b423026ac1ad8b099bc3ecd44ba4fc64aae2
rev = dcaf657f1efd2805a26efbe9710609d9480c5bd9
2 changes: 1 addition & 1 deletion lib/example-liquidity-layer
Open in desktop
Submodule example-liquidity-layer updated 45 files
+6 −6 .github/workflows/solana.yml
+18 −9 package-lock.json
+7 −2 solana/Anchor.toml
+53 −41 solana/Cargo.lock
+8 −4 solana/Cargo.toml
+2 −0 solana/Makefile
+7 −0 solana/clippy.toml
+1 −0 solana/modules/common/Cargo.toml
+4 −1 solana/modules/common/src/lib.rs
+7 −6 solana/package.json
+1 −0 solana/programs/matching-engine/Cargo.toml
+7 −4 solana/programs/matching-engine/src/composite/mod.rs
+6 −1 solana/programs/matching-engine/src/lib.rs
+3 −3 solana/programs/matching-engine/src/processor/admin/initialize.rs
+1 −1 solana/programs/matching-engine/src/processor/admin/propose/auction_parameters.rs
+4 −4 solana/programs/matching-engine/src/processor/admin/propose/mod.rs
+11 −0 solana/programs/matching-engine/src/processor/admin/router_endpoint/update/cctp.rs
+1 −1 solana/programs/matching-engine/src/processor/auction/execute_fast_order/cctp.rs
+1 −1 solana/programs/matching-engine/src/processor/auction/execute_fast_order/local.rs
+20 −17 solana/programs/matching-engine/src/processor/auction/execute_fast_order/mod.rs
+1 −1 solana/programs/matching-engine/src/processor/auction/history/add_entry.rs
+1 −1 solana/programs/matching-engine/src/processor/auction/history/create_new.rs
+3 −1 solana/programs/matching-engine/src/processor/auction/offer/improve.rs
+2 −2 solana/programs/matching-engine/src/processor/auction/offer/place_initial/cctp.rs
+4 −4 solana/programs/matching-engine/src/processor/auction/prepare_order_response/cctp.rs
+1 −1 solana/programs/matching-engine/src/processor/fast_fill/reserve_sequence/mod.rs
+2 −2 solana/programs/matching-engine/src/state/auction_history.rs
+2 −2 solana/programs/matching-engine/src/utils/admin.rs
+16 −0 solana/programs/matching-engine/src/utils/mod.rs
+12 −2 solana/programs/token-router/Cargo.toml
+6 −1 solana/programs/token-router/src/lib.rs
+2 −2 solana/programs/token-router/src/processor/redeem_fill/cctp.rs
+15 −2 solana/programs/upgrade-manager/Cargo.toml
+3 −1 solana/programs/upgrade-manager/src/lib.rs
+103 −0 solana/ts/scripts/getMainnetInfo.ts
+1 −1 solana/ts/scripts/getTestnetInfo.ts
+32 −2 solana/ts/scripts/setUpMatchingEngineLut.ts
+2 −26 solana/ts/src/cctp/messageTransmitter/index.ts
+5 −26 solana/ts/src/cctp/tokenMessengerMinter/index.ts
+6 −0 solana/ts/src/idl/json/matching_engine.json
+6 −0 solana/ts/src/idl/ts/matching_engine.ts
+16 −8 solana/ts/src/matchingEngine/index.ts
+17 −2 solana/ts/src/tokenRouter/index.ts
+5 −0 solana/ts/src/upgradeManager/index.ts
+1 −1 solana/ts/tests/01__matchingEngine.ts
28 changes: 19 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion solana/Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
anchor_version = "0.30.0" # CLI
anchor_version = "0.30.1" # CLI
solana_version = "1.18.15"

[features]
Expand Down
66 changes: 39 additions & 27 deletions solana/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions solana/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ features = ["no-entrypoint"]
path = "../universal/rs/messages"

[workspace.dependencies]
anchor-lang = "=0.30.0"
anchor-spl = "=0.30.0"
anchor-lang = "=0.30.1"
anchor-spl = "=0.30.1"
solana-program = "=1.18.15"
hex = "0.4.3"
ruint = "1.9.0"
Expand Down
5 changes: 3 additions & 2 deletions solana/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ fast-transfer-sync:

.PHONY: clippy
clippy:
cargo clippy --workspace --no-deps --all-targets --all-features -- -Dwarnings
cargo clippy --workspace --no-deps --all-targets --features $(NETWORK) -- -Dwarnings

.PHONY: lint
lint: fast-transfer-sync
cargo fmt --check
$(MAKE) clippy
NETWORK=localnet $(MAKE) clippy
NETWORK=testnet $(MAKE) clippy

.PHONY: cargo-test
cargo-test: fast-transfer-sync
Expand Down
Loading