Skip to content

Commit

Permalink
Update build files post framework move
Browse files Browse the repository at this point in the history
  • Loading branch information
CapCap authored and aptos-bot committed Mar 8, 2022
1 parent f10e895 commit 866bd3f
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 26 deletions.
30 changes: 15 additions & 15 deletions aptos-move/transaction-builder-generator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ You may browse command line options with `target/debug/generate-transaction-buil

NOTE: until the Diem version flag is set to greater than `2` the path
used for generating transaction builders should be
`aptos-move/diem-framework/legacy/transaction_scripts/abi`. You can query
`aptos-move/framework/legacy/transaction_scripts/abi`. You can query
this version number by submitting a `get_metadata` request to the JSON-RPC
endpoint.

Expand All @@ -68,8 +68,8 @@ target/debug/generate-transaction-builders \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
--with-custom-aptos-code aptos-move/transaction-builder-generator/examples/python3/custom_aptos_code/*.py -- \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [Python demo file](examples/python3/stdlib_demo.py) with:
```bash
Expand All @@ -86,8 +86,8 @@ target/debug/generate-transaction-builders \
--module-name diem_framework \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [C++ demo file](examples/cpp/stdlib_demo.cpp) with:
```bash
Expand All @@ -106,8 +106,8 @@ target/debug/generate-transaction-builders \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
--with-custom-aptos-code aptos-move/transaction-builder-generator/examples/java/custom_aptos_code/*.java -- \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [Java demo file](examples/java/StdlibDemo.java) with:
```bash
Expand All @@ -127,8 +127,8 @@ target/debug/generate-transaction-builders \
--aptos-package-name testing \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [Go demo file](examples/golang/stdlib_demo.go) as follows:
(Note that `$DEST` must be an absolute path)
Expand All @@ -146,8 +146,8 @@ target/debug/generate-transaction-builders \
--module-name framework \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [Rust demo file](examples/rust/stdlib_demo.rs). (See [unit test](tests/generation.rs) for details.)

Expand All @@ -161,8 +161,8 @@ target/debug/generate-transaction-builders \
--module-name diemStdlib \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```

### C#
Expand All @@ -175,8 +175,8 @@ target/debug/generate-transaction-builders \
--with-aptos-types "testsuite/generate-format/tests/staged/diem.yaml" \
--target-source-dir "$DEST" \
--with-custom-aptos-code aptos-move/transaction-builder-generator/examples/csharp/custom_aptos_code/*.cs -- \
"aptos-move/diem-framework/DPN/releases/legacy" \
"aptos-move/diem-framework/DPN/releases/artifacts/current"
"aptos-move/framework/DPN/releases/legacy" \
"aptos-move/framework/DPN/releases/artifacts/current"
```
Next, you may copy and execute the [C# demo file](examples/csharp/StdlibDemo.cs) with:
```bash
Expand Down
6 changes: 3 additions & 3 deletions docker/init/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@ COPY --from=builder /aptos/target/release/aptos-operational-tool /usr/local/bin
### Get DPN Move modules bytecodes for genesis ceremony
RUN mkdir -p /aptos/move/build
RUN mkdir -p /aptos/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/DPN/releases/artifacts/current/build /aptos/move/build
COPY --from=builder /aptos/aptos-move/framework/DPN/releases/artifacts/current/build /aptos/move/build
RUN mv /aptos/move/build/**/bytecode_modules/*.mv /aptos/move/modules
RUN rm -rf /aptos/move/build

### Get experimental Move modules bytecodes for genesis ceremony
RUN mkdir -p /experimental/move/build
RUN mkdir -p /experimental/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build
COPY --from=builder /aptos/aptos-move/framework/experimental/releases/artifacts/current/build /experimental/move/build
RUN mv /experimental/move/build/**/bytecode_modules/*.mv /experimental/move/modules
RUN rm -rf /experimental/move/build

### Get Aptos Move modules bytecodes for genesis ceremony
RUN mkdir -p /aptos-framework/move/build
RUN mkdir -p /aptos-framework/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build
COPY --from=builder /aptos/aptos-move/framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build
RUN mv /aptos-framework/move/build/**/bytecode_modules/*.mv /aptos-framework/move/modules
RUN rm -rf /aptos-framework/move/build

Expand Down
6 changes: 3 additions & 3 deletions docker/tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,21 @@ COPY --from=builder /aptos/target/release/aptos-transaction-replay /usr/local/bi
### Get DPN Move modules bytecodes for genesis ceremony
RUN mkdir -p /aptos/move/build
RUN mkdir -p /aptos/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/DPN/releases/artifacts/current/build /aptos/move/build
COPY --from=builder /aptos/aptos-move/framework/DPN/releases/artifacts/current/build /aptos/move/build
RUN mv /aptos/move/build/**/bytecode_modules/*.mv /aptos/move/modules
RUN rm -rf /aptos/move/build

### Get experimental Move modules bytecodes for genesis ceremony
RUN mkdir -p /experimental/move/build
RUN mkdir -p /experimental/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/experimental/releases/artifacts/current/build /experimental/move/build
COPY --from=builder /aptos/aptos-move/framework/experimental/releases/artifacts/current/build /experimental/move/build
RUN mv /experimental/move/build/**/bytecode_modules/*.mv /experimental/move/modules
RUN rm -rf /experimental/move/build

### Get Aptos Move modules bytecodes for genesis ceremony
RUN mkdir -p /aptos-framework/move/build
RUN mkdir -p /aptos-framework/move/modules
COPY --from=builder /aptos/aptos-move/diem-framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build
COPY --from=builder /aptos/aptos-move/framework/aptos-framework/releases/artifacts/current/build /aptos-framework/move/build
RUN mv /aptos-framework/move/build/**/bytecode_modules/*.mv /aptos-framework/move/modules
RUN rm -rf /aptos-framework/move/build

Expand Down
2 changes: 1 addition & 1 deletion documentation/specifications/crypto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ multi-signatures, with signer accountability. This type of signature supports K
out-of N semantics, for K ≤ N ≤ 32.

The implementation, exposed as a Move standard library module
[(Authenticator)](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/core/sources/Authenticator.move),
[(Authenticator)](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/core/sources/Authenticator.move),
is currently simply a multiple-signature container —rather than a distinct
signing scheme (e.g. MuSig). Nonetheless, we plan to improve it in further
DIPs, while expanding the scope of threshold signing.
Expand Down
6 changes: 3 additions & 3 deletions documentation/specifications/transactions/onchain/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# On-Chain Data and Transactions

Diem transactions mutate and create state (or resources) within the set of [on-chain modules](https://github.com/aptos-labs/aptos-core/tree/main/aptos-move/diem-framework/core/sources), primarily the [Diem Account](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/doc/DiemAccount.md). The transaction format is defined in the [Move Adapter Specification](https://github.com/aptos-labs/aptos-core/blob/main/specifications/move_adapter/README.md). Most participants of the Diem Payment Network (DPN) will submit SignedTransactions containing a [script function](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md). Before release 1.2, clients used scripts. These can be accessed in [compiled form](https://github.com/aptos-labs/aptos-core/tree/release-1.1/language/stdlib/compiled/transaction_scripts) and in their [original form](https://github.com/aptos-labs/aptos-core/tree/release-1.1/language/stdlib/transaction_scripts). The DPN MainNet only allows script functions and this set of pre-registerd scripts to be submitted. Due to the evolving nature of Move and the Move compiler, compiling existing scripts may not result in the form stored in the directory stored above. Hence, it is recommended to use script functions where available or otherwise the compiled scripts.
Diem transactions mutate and create state (or resources) within the set of [on-chain modules](https://github.com/aptos-labs/aptos-core/tree/main/aptos-move/framework/core/sources), primarily the [Diem Account](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/doc/DiemAccount.md). The transaction format is defined in the [Move Adapter Specification](https://github.com/aptos-labs/aptos-core/blob/main/specifications/move_adapter/README.md). Most participants of the Diem Payment Network (DPN) will submit SignedTransactions containing a [script function](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/script_documentation/script_documentation.md). Before release 1.2, clients used scripts. These can be accessed in [compiled form](https://github.com/aptos-labs/aptos-core/tree/release-1.1/language/stdlib/compiled/transaction_scripts) and in their [original form](https://github.com/aptos-labs/aptos-core/tree/release-1.1/language/stdlib/transaction_scripts). The DPN MainNet only allows script functions and this set of pre-registerd scripts to be submitted. Due to the evolving nature of Move and the Move compiler, compiling existing scripts may not result in the form stored in the directory stored above. Hence, it is recommended to use script functions where available or otherwise the compiled scripts.

## Peer to Peer Payments and Transaction Metadata

Most transactions will use the [peer_to_peer_with_metadata script function](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/script_documentation/script_documentation.md#0x1_PaymentScripts_peer_to_peer_with_metadata). This single transaction represents all current transfers between two participants and distinguishes the types of transfers via the embedded metadata.
Most transactions will use the [peer_to_peer_with_metadata script function](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/script_documentation/script_documentation.md#0x1_PaymentScripts_peer_to_peer_with_metadata). This single transaction represents all current transfers between two participants and distinguishes the types of transfers via the embedded metadata.

The metadata is represented by the following `Rust` enum encoded in [Binary Canonical Serialization (BCS)](https://github.com/diem/bcs):

Expand Down Expand Up @@ -105,4 +105,4 @@ For transactions that exceed the travel rule limit must use the off-chain travel

## Dual Attestation Credentials

Diem defines a [DualAttestation::Credential](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/core/sources/DualAttestation.move) resource to support off-chain protocols. This resource contains the `human_name`, `base_url`, and `compliance_public_key` for a VASP. The `base_url` specifies where the VASP hosts its off-chain API and the `compliance_public_key` is used to verify signed transaction metadata and establish authentication in off-chain communication. The values can be set and updated via the [rotate_dual_attestation_info](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/diem-framework/transaction_scripts/rotate_dual_attestation_info.move) script.
Diem defines a [DualAttestation::Credential](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/core/sources/DualAttestation.move) resource to support off-chain protocols. This resource contains the `human_name`, `base_url`, and `compliance_public_key` for a VASP. The `base_url` specifies where the VASP hosts its off-chain API and the `compliance_public_key` is used to verify signed transaction metadata and establish authentication in off-chain communication. The values can be set and updated via the [rotate_dual_attestation_info](https://github.com/aptos-labs/aptos-core/blob/main/aptos-move/framework/transaction_scripts/rotate_dual_attestation_info.move) script.
2 changes: 1 addition & 1 deletion x.toml
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ mark-changed = []

[[determinator.path-rule]]
# Required by get_stdlib_script_abis in transaction-builder-generator.
globs = ["aptos-move/diem-framework/DPN/releases/artifacts/current/**/*"]
globs = ["aptos-move/framework/DPN/releases/artifacts/current/**/*"]
mark-changed = ["transaction-builder-generator"]
post-rule = "skip-rules"

Expand Down

0 comments on commit 866bd3f

Please sign in to comment.