Merge branch 'main' into composer-hooks

Author: St0rmBr3w

examples/lzapp-migration/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @layerzerolabs/lzapp-migration-example
 
+## 0.1.4
+
+### Patch Changes
+
+- eba3669: Rename clear script to retry-payload
+
 ## 0.1.3
 
 ### Patch Changes

examples/lzapp-migration/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/lzapp-migration-example",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -54,6 +54,7 @@
     "@layerzerolabs/lz-evm-messagelib-v2": "^3.0.75",
     "@layerzerolabs/lz-evm-protocol-v2": "^3.0.75",
     "@layerzerolabs/lz-evm-v1-0.7": "^3.0.75",
+    "@layerzerolabs/lz-solana-sdk-v2": "^3.0.81",
     "@layerzerolabs/lz-v2-utilities": "^3.0.75",
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@layerzerolabs/prettier-config-next": "^2.3.39",

…p-migration/tasks/solana/clearPayload.ts …p-migration/tasks/solana/retryPayload.tsexamples/lzapp-migration/tasks/solana/clearPayload.ts renamed to examples/lzapp-migration/tasks/solana/retryPayload.ts examples/lzapp-migration/tasks/solana/clearPayload.ts renamed to examples/lzapp-migration/tasks/solana/retryPayload.ts

@@ -24,7 +24,7 @@ interface Args {
     withPriorityFee: number
 }
 
-task('lz:oft:solana:clear', 'Clear a stored payload on Solana')
+task('lz:oft:solana:retry-payload', 'Retry a stored payload on Solana')
     .addParam('srcEid', 'The source EndpointId', undefined, types.eid)
     .addParam('nonce', 'The nonce of the payload', undefined, types.bigint)
     .addParam('sender', 'The source OApp address (hex)', undefined, types.string)

examples/oapp-aptos-move/.env.example

@@ -14,9 +14,9 @@
 EVM_PRIVATE_KEY=
 EVM_MNEMONIC=
 
-# Movement config - values below are for bardock testnet
-MOVEMENT_INDEXER_URL=https://indexer.testnet.movementnetwork.xyz/v1/graphql
-MOVEMENT_FULLNODE_URL=https://aptos.testnet.bardock.movementlabs.xyz/v1
+# Movement config
+MOVEMENT_INDEXER_URL=
+MOVEMENT_FULLNODE_URL=
 MOVEMENT_ACCOUNT_ADDRESS=
 MOVEMENT_PRIVATE_KEY=
 

examples/oapp-aptos-move/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @layerzerolabs/oapp-aptos-example
 
+## 1.0.5
+
+### Patch Changes
+
+- b1feef7: Devex improvements.
+
 ## 1.0.4
 
 ### Patch Changes

examples/oapp-aptos-move/README.md

@@ -2,6 +2,8 @@
 
 ## Setup and Installation
 
+### Aptos CLI
+
 Install the Aptos CLI (required for deployment):
 
 Aptos does not have native version management capabilities. To simplify the installation process, LayerZero has developed an Aptos CLI Version Manager.
@@ -14,8 +16,14 @@ git clone https://github.com/LayerZero-Labs/aptosup
 
 > **Important:** Version requirements:
 >
-> - For deploying to Aptos chain: Use version >= 6.0.1
-> - For deploying to Movement chain: Use version <= 3.5.0
+> - For Aptos chain: Use version 6.0.1
+> - For Movement chain: Use version 3.5.0
+
+### Example installation
+
+To download the example run:
+
+`LZ_ENABLE_EXPERIMENTAL_MOVE_VM_EXAMPLES=1 npx create-lz-oapp@latest`
 
 Set pnpm to the required version:
 
@@ -67,13 +75,17 @@ Note: Your private key is stored in the .aptos/config.yaml file and will be extr
 
 Create a `.env` file with the following variables:
 
+Note: the aptos specific values can be found in `.aptos/config.yaml` after running `aptos init`
+
+Note: the Movement specific values can be found at: https://docs.movementnetwork.xyz/devs/networkEndpoints#movement-bardock-testnet-aptos-environment and currently Bardock testnet is the only Movement testnet with a deployed layerzero endpoint.
+
 ```bash
 EVM_PRIVATE_KEY=<your-evm-private-key>
 EVM_MNEMONIC=<your-mnemonic>
 
 # If you are deploying to Movement chain
-MOVEMENT_INDEXER_URL=https://indexer.testnet.movementnetwork.xyz/v1/graphql
-MOVEMENT_FULLNODE_URL=https://aptos.testnet.bardock.movementlabs.xyz/v1
+MOVEMENT_INDEXER_URL=<indexer-url>
+MOVEMENT_FULLNODE_URL=<fullnode-url>
 MOVEMENT_ACCOUNT_ADDRESS=<your-movement-account-address>
 MOVEMENT_PRIVATE_KEY=<your-movement-private-key>
 
@@ -84,10 +96,6 @@ APTOS_PRIVATE_KEY=<your-aptos-private-key>
 
 Then run `source .env` in order for your values to be mapped.
 
-Note: the aptos specific values can be found in `.aptos/config.yaml` after running `aptos init`
-
-Note: the Movement specific values can be found at: https://docs.movementnetwork.xyz/devs/networkEndpoints#movement-bardock-testnet-aptos-environment and currently Bardock testnet is the only Movement testnet with a deployed layerzero endpoint.
-
 > **Important:** If using Aptos CLI version >= 6.1.0 (required for Aptos chain), you need to uncomment the following lines in Move.toml and remove the existing AptosFramework dependency:
 >
 > ```
@@ -97,14 +105,27 @@ Note: the Movement specific values can be found at: https://docs.movementnetwork
 > # subdir = "aptos-framework"
 > ```
 
-### Wire setup
+## OApp Config Setup
 
 Before running the deploy and wire commands, first inside of `move.layerzero.config.ts`, set the delegate and owner address to your deployer account address. These can be changed in the future with commands shown later in this README, but for now they should be set to the address you will be running the commands from (deployer account address).
 
+> **Important:** Follow the [LayerZero Project Configuration Guide](https://docs.layerzero.network/v2/developers/evm/create-lz-oapp/project-config) to properly set up your `move.layerzero.config.ts` file with correct endpoint IDs and network configurations before running wiring commands. The configuration can be modified to wire any number supported networks to each other. The current move.layerzero.config.ts file is an example of what is required to deploy and wire BSC testnet to Movement testnet.
+
+`move.layerzero.config.ts`:
+
 ```ts
+// Create contract entries for all contracts you would like to deploy.
+// This is an example entry for Movement testnet.
+const movementContract: OmniPointHardhat = {
+    eid: EndpointId.MOVEMENT_V2_TESTNET,
+    contractName: 'MyOApp',
+}
+
+...
+
     contracts: [
         {
-            contract: your_contract_name,
+            contract: movementContract,
             config: {
                 delegate: 'YOUR_ACCOUNT_ADDRESS',
                 owner: 'YOUR_ACCOUNT_ADDRESS',

examples/oapp-aptos-move/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@layerzerolabs/oapp-aptos-example",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -37,7 +37,7 @@
     "@babel/core": "^7.23.9",
     "@jest/globals": "^29.7.0",
     "@layerzerolabs/devtools-extensible-cli": "^0.0.6",
-    "@layerzerolabs/devtools-move": "^1.0.3",
+    "@layerzerolabs/devtools-move": "^1.0.7",
     "@layerzerolabs/eslint-config-next": "~2.3.39",
     "@layerzerolabs/lz-config-types": "^3.0.15",
     "@layerzerolabs/lz-definitions": "^3.0.75",
@@ -51,7 +51,7 @@
     "@layerzerolabs/move-definitions": "^3.0.15",
     "@layerzerolabs/oapp-evm": "^0.3.2",
     "@layerzerolabs/oft-evm": "^3.1.3",
-    "@layerzerolabs/oft-move": "^1.0.1",
+    "@layerzerolabs/oft-move": "^1.0.2",
     "@layerzerolabs/prettier-config-next": "^2.3.39",
     "@layerzerolabs/solhint-config": "^3.0.12",
     "@layerzerolabs/test-devtools-evm-foundry": "~6.0.3",

examples/oapp/.eslintrc.js

@@ -7,5 +7,6 @@ module.exports = {
         // @layerzerolabs/eslint-config-next defines rules for turborepo-based projects
         // that are not relevant for this particular project
         'turbo/no-undeclared-env-vars': 'off',
+        'import/no-unresolved': 'warn', // Updated to warn to avoid erratic popping up of this particular error even when the package has been installed correctly
     },
 };

examples/oapp/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @layerzerolabs/oapp-example
 
+## 0.5.9
+
+### Patch Changes
+
+- d24cc34: examples/oapp: update to use simple config
+
 ## 0.5.8
 
 ### Patch Changes

examples/oapp/README.md

@@ -99,6 +99,14 @@ More information about available CLI arguments can be found using the `--help` f
 npx hardhat lz:deploy --help
 ```
 
+## 2) Configuring Contracts
+
+Wire your deployed contracts by running:
+
+```bash
+npx hardhat lz:oapp:wire --oapp-config layerzero.config.ts
+```
+
 By following these steps, you can focus more on creating innovative omnichain solutions and less on the complexities of cross-chain communication.
 
 <br></br>