copy in oft202 #1229

nazreen · 2025-02-03T16:14:54Z

This PR amends the lzapp-migration example in the following ways:

add in EndpointV1 OFT contract
add in OFT202 program
amend wire.ts to support Solana too
update README to contain instructions to deploy for EndpointV1 OFT and Solana

Remaining todos:

make config.get.ts work
update v1 send oft script to use buildAdapterParams from evm v1 sdk

Notes

this PR merged into feat/add-solana-v1-migration and not main
downgraded @openzeppelin/contracts": "^5.0.2 and @openzeppelin/contracts-upgradeable": "^5.0.2 to @openzeppelin/contracts": "^4.6.0 and @openzeppelin/contracts-upgradeable@^4.6.0
- due to breaking change in Ownable that causes the import of @layerzerolabs/solidity-examples/contracts/token/oft/v2/OFTV2.sol to break compilation since it used v4 and did not provide an argument to Owner.
- The current lzApp contract should also be reverted to be the same as the original and not provide the constructor argument to Owner to accurately replicate v1 deployments that used v4.

nazreen · 2025-02-03T16:33:29Z

EDIT: resolved

lint is failing due to other examples

Error: @layerzerolabs/omnicounter-devtools#lint: command (/__w/devtools/devtools/packages/omnicounter-devtools) /github/home/setup-pnpm/node_modules/.bin/pnpm run lint exited (1)
Error: @layerzerolabs/onft721-example#lint: command (/__w/devtools/devtools/examples/onft721) /github/home/setup-pnpm/node_modules/.bin/pnpm run lint exited (1)

 Tasks:    8 successful, 50 total
Cached:    0 cached, 50 total
  Time:    2.59s 
Failed:    @layerzerolabs/omnicounter-devtools#lint, @layerzerolabs/onft721-example#lint

nazreen · 2025-02-04T08:12:06Z

Seems like I must update the lockfile, as if not, the following error appears:

 ERR_PNPM_OUTDATED_LOCKFILE  Cannot install with "frozen-lockfile" because pnpm-lock.yaml is not up to date with examples/lzapp-migration/package.json
 ```

nazreen · 2025-02-04T08:18:28Z

The lint errors are erratic, now it's:

Error: @layerzerolabs/devtools-evm-hardhat-test#lint: command (/__w/devtools/devtools/tests/devtools-evm-hardhat-test) /github/home/setup-pnpm/node_modules/.bin/pnpm run lint exited (1)

socket-security · 2025-02-05T09:01:00Z

New, updated, and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package	New capabilities	Transitives	Size	Publisher
npm/@layerzerolabs/[email protected]	None	`+1`	1.06 MB	layerzero-bot
npm/@layerzerolabs/[email protected]	Transitive: environment, eval, filesystem, network	`+201`	79.2 MB	layerzero-bot
npm/@layerzerolabs/[email protected] 🔁 npm/@layerzerolabs/[email protected]	None	`+12`	766 kB	layerzero-bot
npm/@layerzerolabs/[email protected]	Transitive: environment, eval, filesystem, network	`+177`	63.7 MB	layerzero-bot
npm/@solana-developers/[email protected]	environment Transitive: filesystem, network, shell	`+83`	29.6 MB	nickfrosty
npm/@solana/[email protected]	Transitive: environment, filesystem	`+21`	6.29 MB	solana-devs

View full report↗︎

socket-security · 2025-02-05T09:01:02Z

🚨 Potential security issues detected. Learn more about Socket for GitHub ↗︎

To accept the risk, merge this PR and you will not be notified again.

Alert	Package	Note	Source	CI
Unstable ownership	npm/@solana/[email protected]	Author: solana-devs	`examples/lzapp-migration/package.json` `pnpm-lock.yaml`	⚠︎

View full report↗︎

Next steps

What is unstable ownership?

A new collaborator has begun publishing package versions. Package stability and security risk may be elevated.

Try to reduce the number of authors you depend on to reduce the risk to malicious actors gaining access to your supply chain. Packages should remove inactive collaborators with publishing rights from packages on npm.

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/[email protected] or ignore all packages with @SocketSecurity ignore-all

@SocketSecurity ignore npm/@solana/[email protected]

Signed-off-by: Ryan Goulding <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…s oft202 (#1252)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

St0rmBr3w · 2025-02-10T16:42:06Z

examples/lzapp-migration/contracts/MyEndpointV1OFTV2.sol

+
+import "@layerzerolabs/solidity-examples/contracts/token/oft/v2/OFTV2.sol";
+
+contract MyEndpointV1OFTV2 is OFTV2 {


Worth adding some solidity natspec warnings here stating that this is an EndpointV1 contract in bold, I get that the name is EndpointV1OFTV2, but devs in the past wonder about the inheritance tree and the "solidity-examples" package doesn't do a good job of explaining this.

addressed in 99a23db#diff-cc654fa4f8bae669ef4742724e239be8f2465ebac7c37a71ef40c16f2bea8081R7

St0rmBr3w · 2025-02-10T16:42:39Z

examples/lzapp-migration/contracts/MyLzApp.sol

     */
-    constructor(address _endpoint, address _owner) NonblockingLzApp(_endpoint) Ownable(_owner) {}
+    constructor(address _endpoint) NonblockingLzApp(_endpoint) {}


Is the reason you removed ownable here because you are using OZ v4?

Yes, I mentioned OZ v5 -> v4 downgrade in the PR body

St0rmBr3w · 2025-02-10T16:42:54Z

examples/lzapp-migration/contracts/MyOApp.sol

@@ -44,7 +43,7 @@ contract MyOApp is OApp {
     *                  protocol-specific settings for the application, such as managing
     *                  message libraries and configuring messaging parameters.
     */
-    constructor(address _endpoint, address _delegate) OApp(_endpoint, _delegate) Ownable(_delegate) {}
+    constructor(address _endpoint, address _delegate) OApp(_endpoint, _delegate) {}


Same question here, OZ v4 I'm guessing?

yes, refer to above comment's reply

St0rmBr3w · 2025-02-10T16:44:08Z

examples/lzapp-migration/layerzero.config.ts

            config: {
-                sendLibrary: '0x4f7cd4DA19ABB31b0eC98b9066B9e857B1bf9C0E',
+                sendLibrary: '0x6862b19f6e42a810946B9C782E6ebE26Ad266C84',


Would be good to add some comments here similar to what we've done with the solana repo to callout that the send and receive libraries are SendUln301 and ReceiveUln301 on each chain.

on this note actually, are these addresses in lz-definitions? always thought that having string literal values were quite cryptic. would be much better if we can have them like the endpoint IDs, referanceable via constants

addressed in 99a23db#diff-871c897433e41854bf35b966b47b04824c9a0d2370687b54d878b99ff710acf1R100

St0rmBr3w · 2025-02-10T16:44:52Z

examples/lzapp-migration/layerzero.config.ts

                    },
                    ulnConfig: {
                        confirmations: BigInt(1),
-                        requiredDVNs: ['0x3a74f7174709842d3b8a14ce60b4aa2499f2a2f2'],
+                        requiredDVNs: ['0x8eebf8b423b73bfca51a1db4b7354aa0bfca9193'], // LayerZero Labs DVN


DVNs on the other hand are just whatever DVN is available per chain, since DVNs are only available as a V2 property, and thus, don't need to worry about mixing up with V1 Oracles.

Do you mean, the label here is not as necessary ? Per my above comment, I think it's too cryptic to have only the string literal.

St0rmBr3w · 2025-02-10T16:45:43Z

examples/lzapp-migration/package.json

    "compile:forge": "forge build",
    "compile:hardhat": "hardhat compile",
    "lint": "$npm_execpath run lint:js && $npm_execpath run lint:sol",
    "lint:fix": "eslint --fix '**/*.{js,ts,json}' && prettier --write . && solhint 'contracts/**/*.sol' --fix --noPrompt",
    "lint:js": "eslint '**/*.{js,ts,json}' && prettier --check .",
    "lint:sol": "solhint 'contracts/**/*.sol'",
    "test": "$npm_execpath run test:forge && $npm_execpath run test:hardhat",
+    "test:anchor": "anchor test",


I think we ran into issues with keeping anchor test in the overarching test command as it would fail when it hit the CI due to keys not matching.

Was this an issue at all for you?

I added this in here to ensure parity with oft-solana, which as you are implying, does not have the anchor test included as part of the general test command. I also didn't add it to general test here.

St0rmBr3w · 2025-02-10T16:46:11Z

examples/lzapp-migration/package.json

@@ -48,8 +64,8 @@
    "@layerzerolabs/toolbox-hardhat": "~0.6.5",
    "@nomicfoundation/hardhat-ethers": "^3.0.5",
    "@nomiclabs/hardhat-ethers": "^2.2.3",
-    "@openzeppelin/contracts": "^5.0.2",
-    "@openzeppelin/contracts-upgradeable": "^5.0.2",
+    "@openzeppelin/contracts": "^4.6.0",


We should probably call out in the README somewhere that this only works for OZ V4.

examples/lzapp-migration/tasks/common/wire.ts

St0rmBr3w · 2025-02-10T16:48:36Z

examples/lzapp-migration/tasks/common/wire.ts


-            if (transactions.length === 0) {
-                logger.info('The LzApp is wired, no action is necessary')


Is there a reason you removed the logger.info calls?

I didn't. It just got moved to https://github.com/LayerZero-Labs/devtools/blob/feat/add-solana-v1-migration/examples/lzapp-migration/tasks/common/wire.ts#L215-L217

examples/lzapp-migration/tasks/evm/v1/sendMessage.ts

Signed-off-by: Ryan Goulding <[email protected]> Co-authored-by: Ryan Goulding <[email protected]> Co-authored-by: layerzero-bot <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthew Krak <[email protected]>

nazreen force-pushed the nazreen/copy-in-oft202 branch from 857ab0e to 11511c8 Compare February 4, 2025 09:45

nazreen force-pushed the feat/add-solana-v1-migration branch from 7727dcf to c9e57c3 Compare February 5, 2025 03:11

nazreen force-pushed the nazreen/copy-in-oft202 branch 2 times, most recently from 4bce532 to f463bd8 Compare February 5, 2025 03:16

nazreen marked this pull request as draft February 5, 2025 16:35

nazreen force-pushed the feat/add-solana-v1-migration branch from 765d260 to afbdde0 Compare February 6, 2025 10:03

nazreen force-pushed the nazreen/copy-in-oft202 branch from fec9846 to 696d063 Compare February 6, 2025 10:13

ryandgoulding and others added 2 commits February 6, 2025 10:19

chore: explicitly enable foundry optimizer (#1245)

213a76b

Signed-off-by: Ryan Goulding <[email protected]>

🚀 Version packages (#1246)

b8a3d43

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

nazreen force-pushed the nazreen/copy-in-oft202 branch from 0df94d6 to e81765e Compare February 8, 2025 14:38

nazreen and others added 2 commits February 8, 2025 22:59

chore(ua-devtools-solana): update solana deps to version that support…

2341af2

…s oft202 (#1252)

🚀 Version packages (#1254)

7693a31

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

nazreen requested review from St0rmBr3w and EWCunha February 10, 2025 10:12

nazreen marked this pull request as ready for review February 10, 2025 15:04

St0rmBr3w reviewed Feb 10, 2025

View reviewed changes

examples/lzapp-migration/tasks/common/wire.ts Show resolved Hide resolved

St0rmBr3w reviewed Feb 10, 2025

View reviewed changes

examples/lzapp-migration/tasks/evm/v1/sendMessage.ts Show resolved Hide resolved

nazreen and others added 22 commits February 10, 2025 11:01

format to address

7c261e0

rename contract object

97c899f

insert Solana

04508b0

lz config - use LZ Labs DVNs

5d86e74

setup endpoint v1 oft

86084c9

remove Ownable to match OZ v4

1993763

update contract name

e9c5062

remove need for metadata-tools

9c15cf5

Trigger Build

d11b34b

changeset

8a53047

script to send from v1 to solana

75554b2

move files

ee8147d

send script for Solana to Sepolia v1

a1a89f4

lint

dda6af7

lint

3a0d31c

update ua-devtools-solana

3225160

set min dst gas script

34239ff

amend

77210fe

readme

221a62b

restructure tasks folder

a1412f3

chore: fix lockfile

b4d727d

chore: fix linting and declarations

bb31210

St0rmBr3w force-pushed the nazreen/copy-in-oft202 branch from 485bdba to bb31210 Compare February 10, 2025 19:02

St0rmBr3w and others added 4 commits February 10, 2025 11:03

chore: update lockfile

31749da

Trigger Build

e281e90

Merge branch 'feat/add-solana-v1-migration' into nazreen/copy-in-oft202

4b3c06e

chore: fix lockfile

fb32b29

St0rmBr3w merged commit f6690c9 into feat/add-solana-v1-migration Feb 10, 2025
2 of 5 checks passed

St0rmBr3w deleted the nazreen/copy-in-oft202 branch February 10, 2025 19:29


		import "@layerzerolabs/solidity-examples/contracts/token/oft/v2/OFTV2.sol";

		contract MyEndpointV1OFTV2 is OFTV2 {


		if (transactions.length === 0) {
		logger.info('The LzApp is wired, no action is necessary')

copy in oft202 #1229

copy in oft202 #1229

Uh oh!

Conversation

nazreen commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nazreen commented Feb 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nazreen commented Feb 4, 2025

Uh oh!

nazreen commented Feb 4, 2025

Uh oh!

socket-security bot commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

socket-security bot commented Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Next steps

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nazreen Feb 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nazreen commented Feb 3, 2025 •

edited

Loading

nazreen commented Feb 3, 2025 •

edited

Loading

socket-security bot commented Feb 5, 2025 •

edited

Loading

socket-security bot commented Feb 5, 2025 •

edited

Loading

nazreen Feb 11, 2025 •

edited

Loading