Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions .github/workflows/build-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
workflow_dispatch:
inputs:
ref:
description: 'The git ref to build (branch, tag, sha).'
description: "The git ref to build (branch, tag, sha)."
required: true
default: 'main'
default: "main"
build_profile:
description: 'The cargo build profile to use.'
default: 'release'
description: "The cargo build profile to use."
default: "release"

jobs:
setup:
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
echo "build_profile=${{ inputs.build_profile || 'release' }}" >> $GITHUB_OUTPUT

binaries-aptos-node:
needs:
needs:
- setup
runs-on: blacksmith-16vcpu-ubuntu-2204
name: "Build ${{ matrix.binary.package }} with Nix"
Expand All @@ -90,14 +90,14 @@ jobs:
with:
ref: ${{ inputs.ref || github.sha}}
- name: Build binary ${{ matrix.binary.package }}
uses: movementlabsxyz/aptos-core/.github/actions/build-binary@m1
uses: movement-network/aptos-core/.github/actions/build-binary@m1
with:
binary_package: ${{ matrix.binary.package }}
profile: ${{ needs.setup.outputs.build_profile }}
github_token: ${{ secrets.GITHUB_TOKEN }}
git_sha: ${{ needs.setup.outputs.git_sha }}
container-aptos-node:
needs:
needs:
- setup
- binaries-aptos-node
runs-on: blacksmith-16vcpu-ubuntu-2204
Expand Down Expand Up @@ -130,11 +130,11 @@ jobs:
path: ${{ env.TARGET_FOLDER }}
- name: List binaries
run: ls -la ${{ env.TARGET_FOLDER }}

- name: Build Container
uses: movementlabsxyz/aptos-core/.github/actions/build-container@m1
uses: movement-network/aptos-core/.github/actions/build-container@m1
with:
image_name: ghcr.io/movementlabsxyz/aptos-node
image_name: ghcr.io/movement-network/aptos-node
dockerfile_subdir: aptos-node
build_args: |
BINARY_PATH=${{ env.TARGET_FOLDER }}
Expand Down Expand Up @@ -170,9 +170,9 @@ jobs:
- name: List binaries
run: ls -la ${{ env.TARGET_FOLDER }}
- name: Build Container
uses: movementlabsxyz/aptos-core/.github/actions/build-container@m1
uses: movement-network/aptos-core/.github/actions/build-container@m1
with:
image_name: ghcr.io/movementlabsxyz/aptos-debugger
image_name: ghcr.io/movement-network/aptos-debugger
dockerfile_subdir: aptos-debugger
build_args: |
BINARY_PATH=${{ env.TARGET_FOLDER }}
Expand All @@ -185,7 +185,7 @@ jobs:
git_sha: ${{ needs.setup.outputs.git_sha }}

binaries-aptos-faucet-service:
needs:
needs:
- setup
runs-on: blacksmith-16vcpu-ubuntu-2204
name: "Build ${{ matrix.binary.package }} with Nix"
Expand All @@ -200,14 +200,14 @@ jobs:
with:
ref: ${{ inputs.ref || github.sha}}
- name: Build binary ${{ matrix.binary.package }}
uses: movementlabsxyz/aptos-core/.github/actions/build-binary@m1
uses: movement-network/aptos-core/.github/actions/build-binary@m1
with:
binary_package: ${{ matrix.binary.package }}
profile: ${{ needs.setup.outputs.build_profile }}
github_token: ${{ secrets.GITHUB_TOKEN }}
git_sha: ${{ needs.setup.outputs.git_sha }}
container-aptos-faucet-service:
needs:
needs:
- setup
- binaries-aptos-faucet-service
runs-on: blacksmith-16vcpu-ubuntu-2204
Expand All @@ -230,11 +230,11 @@ jobs:
path: ${{ env.TARGET_FOLDER }}
- name: List binaries
run: ls -la ${{ env.TARGET_FOLDER }}

- name: Build Container
uses: movementlabsxyz/aptos-core/.github/actions/build-container@m1
uses: movement-network/aptos-core/.github/actions/build-container@m1
with:
image_name: ghcr.io/movementlabsxyz/aptos-faucet-service
image_name: ghcr.io/movement-network/aptos-faucet-service
dockerfile_subdir: aptos-faucet-service
build_args: |
BINARY_PATH=${{ env.TARGET_FOLDER }}
Expand All @@ -247,7 +247,7 @@ jobs:
git_sha: ${{ needs.setup.outputs.git_sha }}

binaries-aptos-tools:
needs:
needs:
- setup
runs-on: blacksmith-16vcpu-ubuntu-2204
name: "Build ${{ matrix.binary.package }} with Nix"
Expand All @@ -262,9 +262,9 @@ jobs:
with:
ref: ${{ inputs.ref || github.sha}}
- name: Build binary ${{ matrix.binary.package }}
uses: movementlabsxyz/aptos-core/.github/actions/build-binary@m1
uses: movement-network/aptos-core/.github/actions/build-binary@m1
with:
binary_package: ${{ matrix.binary.package }}
profile: ${{ needs.setup.outputs.build_profile }}
github_token: ${{ secrets.GITHUB_TOKEN }}
git_sha: ${{ needs.setup.outputs.git_sha }}
git_sha: ${{ needs.setup.outputs.git_sha }}
4 changes: 2 additions & 2 deletions .github/workflows/claude-audit-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: Claude Audit PR
# because that would expose repository secrets to untrusted code.
#
# Audit *content* (subagent definition, analyzers, prompt, settings) lives in
# movementlabsxyz/claude-pr-reviewer and is checked out + staged at runtime.
# movement-network/claude-pr-reviewer and is checked out + staged at runtime.
# Bump REVIEWER_REF below to upgrade. See that repo's README for the consumer
# contract.

Expand Down Expand Up @@ -43,7 +43,7 @@ concurrency:
env:
# Pin to a tag (e.g. v1, v0.1.0) or an immutable SHA. Rolling tags pick up
# patches automatically; SHAs require a bump PR but are tamper-evident.
REVIEWER_REPO: movementlabsxyz/claude-pr-reviewer
REVIEWER_REPO: movement-network/claude-pr-reviewer
REVIEWER_REF: v1

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-builder-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ permissions:

env:
REGISTRY: ghcr.io
IMAGE_NAMESPACE: ghcr.io/movementlabsxyz
IMAGE_NAMESPACE: ghcr.io/movement-network
DEBIAN_CONTEXT: docker-image://debian:bullseye@sha256:cf48c31af360e1c0a0aedd33aae4d928b68c2cdf093f1612650eb1ff434d1c34
PROFILE: release
FEATURES: ""
Expand Down
4 changes: 2 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ container-build container="aptos-node" tag="latest" profile="release":
docker build \
--build-arg BINARY_PATH="$BINARY_PATH" \
-f docker/{{container}}/Dockerfile \
-t ghcr.io/movementlabsxyz/{{container}}:{{tag}} .
-t ghcr.io/movement-network/{{container}}:{{tag}} .

# Clean up the copied binary
rm -f aptos-test

# Push a container image to GHCR
container-push container="aptos-node" tag="latest":
docker push ghcr.io/movementlabsxyz/{{container}}:{{tag}}
docker push ghcr.io/movement-network/{{container}}:{{tag}}

# Build and push a container image
container-release container="aptos-node" tag="latest" profile="release":
Expand Down
4 changes: 2 additions & 2 deletions aptos-move/aptos-release-builder/data/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ proposals:
metadata:
title: "Disable concurrent fungible balance"
description: "This is for disabling concurrent fungible balance"
source_code_url: "https://github.com/movementlabsxyz/aptos-core"
discussion_url: "https://github.com/movementlabsxyz/aptos-core"
source_code_url: "https://github.com/movement-network/aptos-core"
discussion_url: "https://github.com/movement-network/aptos-core"
execution_mode: RootSigner
update_sequence:
- Framework:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn generate_upgrade_proposals(
"only multi-step proposals can have a next execution hash"
);

const MVT_APTOS_GIT_PATH: &str = "https://github.com/movementlabsxyz/aptos-core.git";
const MVT_APTOS_GIT_PATH: &str = "https://github.com/movement-network/aptos-core.git";

// NOTE: This is skipping 0x7 (aptos-experimental package) which is only meant to be released
// to devnet (or local testnet) via the genesis process and never released/upgraded in testnet
Expand Down
2 changes: 1 addition & 1 deletion consensus/consensus-types/src/pipelined_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ impl PipelinedBlock {
// https://github.com/aptos-labs/aptos-core/pull/18699 (upstream optimization that introduced the cycle)
// https://github.com/aptos-labs/aptos-core/pull/19359 (corrective patch)
// https://github.com/aptos-labs/aptos-core/commit/fefcfade3edf26f0396d63963f7ea04364f3666f
// https://github.com/movementlabsxyz/aptos-core/pull/322 (full analysis with diagrams)
// https://github.com/movement-network/aptos-core/pull/322 (full analysis with diagrams)
//
// If a similar change is ever introduced here — anything that makes
// rand aggregation wait on a pipeline-derived future — this function
Expand Down
14 changes: 7 additions & 7 deletions crates/aptos/homebrew/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
Homebrew is a package manager that works for MacOS Silicon and Intel chips as well as Linux distributions like Debian
and Ubuntu.

The [Movement command line interface (CLI)](https://github.com/movementlabsxyz/aptos-core/) may be installed
The [Movement command line interface (CLI)](https://github.com/movement-network/aptos-core/) may be installed
via [Homebrew](https://brew.sh/) for simplicity. This is an in-depth overview of Homebrew and the Movement formula. In this
guide, we go over each section of the Homebrew formula and steps to implement changes in the future.

## Quick guide

- [Formula in Homebrew GitHub](https://github.com/Homebrew/homebrew-core/blob/master/Formula/movement.rb)
- [Movement <version-number> New Formula PR for GitHub](<link-to-PR>)
- [Movement <version-number> New Formula PR for GitHub](link-to-PR)

## Getting started

Expand Down Expand Up @@ -178,9 +178,9 @@ brew livecheck --debug movement
end

# Currently must compile with the same rustc version specified in the
# root Cargo.toml file of aptos-core (currently it is pegged to Rust
# root Cargo.toml file of aptos-core (currently it is pegged to Rust
# v1.64). In the future if it becomes compatible with the latest Rust
# toolchain, we can remove the use of rustup-init, replacing it with a
# toolchain, we can remove the use of rustup-init, replacing it with a
# depends_on "rust" => :build
# above and build the binary without rustup as a dependency
#
Expand Down Expand Up @@ -221,7 +221,7 @@ key.
- To view other Homebrew-related FAQs or ask questions yourself, visit
the [discussions board](https://github.com/orgs/Homebrew/discussions).
- For similar Rust-related build examples, we recommend:
- [`rustfmt.rb`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/rustfmt.rb)
- [`rustfmt.rb`](https://github.com/Homebrew/homebrew-core/blob/master/Formula/rustfmt.rb)
- Finally, note these key Homebew guides:
- [Homebrew Formula Cookbook](https://docs.brew.sh/Formula-Cookbook)
- [Creating and Running Your Own Homebrew Tap - Rust Runbook](https://publishing-project.rivendellweb.net/creating-and-running-your-own-homebrew-tap/)
- [Homebrew Formula Cookbook](https://docs.brew.sh/Formula-Cookbook)
- [Creating and Running Your Own Homebrew Tap - Rust Runbook](https://publishing-project.rivendellweb.net/creating-and-running-your-own-homebrew-tap/)
40 changes: 17 additions & 23 deletions crates/aptos/src/move_tool/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ impl FrameworkPackageArgs {
prompt_options: PromptOptions,
) -> CliTypedResult<()> {
const APTOS_FRAMEWORK: &str = "AptosFramework";
const APTOS_GIT_PATH: &str = "https://github.com/movementlabsxyz/aptos-core.git";
const APTOS_GIT_PATH: &str = "https://github.com/movement-network/aptos-core.git";
const SUBDIR_PATH: &str = "aptos-move/framework/aptos-framework";
const DEFAULT_BRANCH: &str = "m1";

Expand All @@ -232,30 +232,24 @@ impl FrameworkPackageArgs {
// Add the framework dependency if it's provided
let mut dependencies = BTreeMap::new();
if let Some(ref path) = self.framework_local_dir {
dependencies.insert(
APTOS_FRAMEWORK.to_string(),
Dependency {
local: Some(path.display().to_string()),
git: None,
rev: None,
subdir: None,
aptos: None,
address: None,
},
);
dependencies.insert(APTOS_FRAMEWORK.to_string(), Dependency {
local: Some(path.display().to_string()),
git: None,
rev: None,
subdir: None,
aptos: None,
address: None,
});
} else {
let git_rev = self.framework_git_rev.as_deref().unwrap_or(DEFAULT_BRANCH);
dependencies.insert(
APTOS_FRAMEWORK.to_string(),
Dependency {
local: None,
git: Some(APTOS_GIT_PATH.to_string()),
rev: Some(git_rev.to_string()),
subdir: Some(SUBDIR_PATH.to_string()),
aptos: None,
address: None,
},
);
dependencies.insert(APTOS_FRAMEWORK.to_string(), Dependency {
local: None,
git: Some(APTOS_GIT_PATH.to_string()),
rev: Some(git_rev.to_string()),
subdir: Some(SUBDIR_PATH.to_string()),
aptos: None,
address: None,
});
}

let manifest = MovePackageManifest {
Expand Down
2 changes: 1 addition & 1 deletion devtools/aptos-cargo-cli/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ fn recompute_merge_base_metadata(
.arg("clone")
.arg("--depth")
.arg("500") // Clone the last 500 commits to ensure the merge base is included
.arg("https://github.com/movementlabsxyz/aptos-core.git")
.arg("https://github.com/movement-network/aptos-core.git")
.arg(clone_directory.clone())
.output()
.expect("failed to execute git clone");
Expand Down
6 changes: 3 additions & 3 deletions docker/aptos-debugger/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ From the repository root:
just container-build aptos-debugger latest release

# Verify
docker run --rm ghcr.io/movementlabsxyz/aptos-debugger:latest --version
docker run --rm ghcr.io/movement-network/aptos-debugger:latest --version
```

## Pushing to GHCR
Expand All @@ -34,14 +34,14 @@ docker run --rm ghcr.io/movementlabsxyz/aptos-debugger:latest --version
docker login ghcr.io -u <username>

# Push
docker push ghcr.io/movementlabsxyz/aptos-debugger:latest
docker push ghcr.io/movement-network/aptos-debugger:latest
```

## CI

The `build-versions.yaml` workflow automatically builds and pushes this image on
every push to the default branch. The image is tagged with the short git SHA
(e.g., `ghcr.io/movementlabsxyz/aptos-debugger:f24a5bc`).
(e.g., `ghcr.io/movement-network/aptos-debugger:f24a5bc`).

## Runtime Dependencies

Expand Down
2 changes: 1 addition & 1 deletion movement-migration/framework-upgrades/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ version = "0.0.0"
admin = "0x1"

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "movement"
subdir = "aptos-move/framework/aptos-framework"
2 changes: 1 addition & 1 deletion movement-migration/post-migration/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ version = "0.0.0"
admin = "0x1"

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "l1-migration"
subdir = "aptos-move/framework/aptos-framework"
2 changes: 1 addition & 1 deletion movement-migration/post-move2-upgrade/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ version = "0.0.0"
admin = "0x1"

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "l1-migration"
subdir = "aptos-move/framework/aptos-framework"
2 changes: 1 addition & 1 deletion movement-migration/test-proposal/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ version = "0.0.0"
admin = "0x1"

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "l1-migration"
subdir = "aptos-move/framework/aptos-framework"
2 changes: 1 addition & 1 deletion movement-migration/update_reconfiguration/Move.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ name = "UpdateReconfiguration"
version = "0.0.0"

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "movement"
subdir = "aptos-move/framework/aptos-framework"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = []
[dev-addresses]

[dependencies.AptosFramework]
git = "https://github.com/movementlabsxyz/aptos-core.git"
git = "https://github.com/movement-network/aptos-core.git"
rev = "l1-migration"
subdir = "aptos-move/framework/aptos-framework"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "Disable concurrent fungible balance",
"description": "This is for disabling concurrent fungible balance",
"source_code_url": "https://github.com/movementlabsxyz/aptos-core",
"discussion_url": "https://github.com/movementlabsxyz/aptos-core"
}
"source_code_url": "https://github.com/movement-network/aptos-core",
"discussion_url": "https://github.com/movement-network/aptos-core"
}
Loading
Loading