Skip to content

Commit

Permalink
Update sdk to upstream branch testing-branch-by-larry-1 (#667)
Browse files Browse the repository at this point in the history
Co-authored-by: Aptos Bot <[email protected]>
Co-authored-by: Larry Liu <[email protected]>
  • Loading branch information
3 people authored Jan 14, 2025
1 parent 03ce9eb commit 27d9d66
Show file tree
Hide file tree
Showing 30 changed files with 129 additions and 124 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/update-sdk-dependency.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ jobs:
aptos_protos_commit_hash="${{ github.event.inputs.aptos_protos_commit_hash || github.event.client_payload.aptos_protos_commit_hash }}"
branch_name="${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}"
# SDK commit hash
# SDK commit hash SDK + framework + testing.
toml set Cargo.toml workspace.dependencies.aptos-indexer-processor-sdk.rev "$commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
toml set Cargo.toml workspace.dependencies.aptos-indexer-processor-sdk-server-framework.rev "$commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
toml set Cargo.toml workspace.dependencies.aptos-indexer-testing-framework.rev "$aptos_protos_commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
toml set Cargo.toml workspace.dependencies.aptos-indexer-testing-framework.rev "$commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
# Protos commit hash
toml set Cargo.toml workspace.dependencies.aptos-protos.rev "$aptos_protos_commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
toml set Cargo.toml workspace.dependencies.aptos-indexer-test-transactions.rev "$commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
toml set Cargo.toml workspace.dependencies.aptos-indexer-test-transactions.rev "$aptos_protos_commit_hash" > Cargo.tmp && mv Cargo.tmp Cargo.toml
# Refresh the lock file
cargo build
working-directory: rust/
- name: Configure Git user
run: |
Expand All @@ -69,6 +71,7 @@ jobs:
commit_hash="${{ github.event.inputs.commit_hash || github.event.client_payload.commit_hash }}"
git checkout -b "$branch_name"
git add Cargo.toml
git add Cargo.lock
git commit -m "Update sdk to $commit_hash"
git push origin "$branch_name" --force
env:
Expand Down
128 changes: 65 additions & 63 deletions rust/Cargo.lock

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

16 changes: 8 additions & 8 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ testing-transactions = { path = "testing-transactions" }

ahash = { version = "0.8.7", features = ["serde"] }
anyhow = "1.0.86"
aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "e6867c50a2c30ef16ad6f82e02313b2ba5ce361a" }
aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "e6867c50a2c30ef16ad6f82e02313b2ba5ce361a" }
aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "5c48aee129b5a141be2792ffa3d9bd0a1a61c9cb" }
aptos-indexer-processor-sdk = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" }
aptos-indexer-processor-sdk-server-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" }
aptos-protos = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6116af69aa173ca49e1761daabd6fe103fe2c65e" }
aptos-system-utils = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "202bdccff2b2d333a385ae86a4fcf23e89da9f62" }
aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "8bb628129ff48241c650178caf1ff8bf53a44e5e" }
aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "e6867c50a2c30ef16ad6f82e02313b2ba5ce361a" }
aptos-indexer-test-transactions = { git = "https://github.com/aptos-labs/aptos-core.git", rev = "6116af69aa173ca49e1761daabd6fe103fe2c65e" }
aptos-indexer-testing-framework = { git = "https://github.com/aptos-labs/aptos-indexer-processor-sdk.git", rev = "a56b641a6aaca60092fcc9bbd98252f3cd703299" }
async-trait = "0.1.53"
backtrace = "0.3.58"
base64 = "0.13.0"
Expand Down Expand Up @@ -90,8 +90,8 @@ once_cell = "1.10.0"
num_cpus = "1.16.0"
pbjson = "0.5.1"
prometheus = { version = "0.13.3", default-features = false }
prost = { version = "0.12.3", features = ["no-recursion-limit"] }
prost-types = "0.12.3"
prost = { version = "0.13.4", features = ["no-recursion-limit"] }
prost-types = "0.13.4"
# Keep it compatible with the aptos-core version.
rayon = "1.5.2"
regex = "1.5.5"
Expand All @@ -113,7 +113,7 @@ toml = "0.7.4"
tracing-subscriber = { version = "0.3.17", features = ["json", "env-filter"] }
tiny-keccak = { version = "2.0.2", features = ["keccak", "sha3"] }
tokio = { version = "1.35.1", features = ["full"] }
tonic = { version = "0.11.0", features = [
tonic = { version = "0.12.3", features = [
"tls",
"tls-roots",
"transport",
Expand Down
Loading

0 comments on commit 27d9d66

Please sign in to comment.