Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
307845a
feat(wip): foundry init, add interface for CrossChainDeployAdapter
stonecharioteer Jan 16, 2024
716c3de
feat(wip): update computeContractAddress fn definition
stonecharioteer Jan 16, 2024
6b217ae
fix(wip): typo with interfaces, don't use {}
stonecharioteer Jan 16, 2024
8e33f39
fix(wip): fix deploy interface definition
stonecharioteer Jan 16, 2024
fd7434c
feat: add CrossChainDeployScript.sol, update the interface with the d…
stonecharioteer Jan 19, 2024
4c2d7a6
chore: rename CrosschainDeployScript file and contract for consistenc…
stonecharioteer Jan 19, 2024
bd519d5
feat(wip): fix function calls and type for callData
stonecharioteer Jan 19, 2024
3636d7a
chore(wip): remove FIXME
stonecharioteer Jan 19, 2024
40f2c07
feat(wip): update justfile with some more planned tools
stonecharioteer Jan 19, 2024
88bc0b1
feat(wip): add `value` to `deploy` call so that it gets the payment.
stonecharioteer Jan 19, 2024
ea929d5
feat(wip): track deployment targets using an array and store the avai…
stonecharioteer Jan 25, 2024
70206c9
feat(wip): cleanup docstrings, fix typos
stonecharioteer Jan 25, 2024
fe7a0da
feat(wip): implement computeAddressForChain
stonecharioteer Jan 25, 2024
06773c5
feat(wip): map constructorArgs and initDatas separately as well
stonecharioteer Jan 25, 2024
367fbb9
feat(wip): use arrays to store a list of constructor args and init da…
stonecharioteer Jan 25, 2024
be4c339
feat(wip): remove unused domain IDs from the constructor
stonecharioteer Jan 25, 2024
60dedd4
chore(wip): remove unnecessary custom error situation
stonecharioteer Jan 29, 2024
444eba6
feat(wip): add generateSalt
stonecharioteer Jan 29, 2024
8b12528
chore(wip): move deployment target check to modifier
stonecharioteer Jan 29, 2024
456569e
fix(wip): use generateSalt instead of asking users to provide the salt
stonecharioteer Jan 29, 2024
fd883f4
fix(wip): increment randomness counter
stonecharioteer Jan 29, 2024
f219167
feat(wip): fix function signature for computeContractAddress, and cal…
stonecharioteer Jan 29, 2024
7df5ba6
chore(wip): purge the deployment targets after deploying
stonecharioteer Jan 29, 2024
b4685f3
fix(wip): rename functions for uniformity, fix array reset syntax to …
stonecharioteer Jan 31, 2024
25a70c2
chore(wip): update justfile to use forge's native `watch` flag
stonecharioteer Jan 31, 2024
4c62035
feat(wip): add unit tests and a mock for adapter
stonecharioteer Jan 31, 2024
1919e87
docs(wip): Update README to show how to use this, and also add some d…
stonecharioteer Jan 31, 2024
3ce7924
feat(wip): add integration test, test steps to justfile
stonecharioteer Jan 31, 2024
b6998f8
feat(wip): add support for .env file for the justfile and use it for …
stonecharioteer Jan 31, 2024
b4b6ca5
chore: update justfile to not use private key for integration tests.
stonecharioteer Jan 31, 2024
f82c1e5
feat(wip): fix argument for constructor and initdata
stonecharioteer Feb 1, 2024
b124e3c
feat(wip): fix argument for constructor and initdata
stonecharioteer Feb 1, 2024
e57869d
feat(wip): Move reset steps into a new function so users can choose t…
stonecharioteer Feb 2, 2024
ed494e0
feat(wip): add `vm.expectCall` to ensure contract calls
stonecharioteer Feb 5, 2024
b926e2c
feat(wip): Add multiple deployment targets & args
stonecharioteer Feb 6, 2024
05912cd
docs(wip): update README to show how to encode arguments
stonecharioteer Feb 6, 2024
5105657
Update README.md
stonecharioteer Feb 7, 2024
63bbcb4
docs(wip): update with installation instructions
stonecharioteer Feb 7, 2024
45ccc31
docs(wip): update with link to forge install docs
stonecharioteer Feb 7, 2024
59eafcf
docs(wip): update the usage example to show how to inherit from this …
stonecharioteer Feb 7, 2024
749ef6a
fix: warnings and stack too deep errors. move contract name to deploy…
mpetrunic Feb 8, 2024
73fdcda
update readme
mpetrunic Feb 8, 2024
2581da3
add env, remove contract address calculation, add link to sygma explorer
mpetrunic Feb 8, 2024
e2ef7f5
more unit tests
mpetrunic Feb 8, 2024
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
3 changes: 3 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# copy this to a `.env` file and set these values.
INTEGRATION_FORK_URL=
INTEGRATION_PRIVATE_KEY=
34 changes: 34 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: test

on: workflow_dispatch

env:
FOUNDRY_PROFILE: ci

jobs:
check:
strategy:
fail-fast: true

name: Foundry project
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
submodules: recursive

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly

- name: Run Forge build
run: |
forge --version
forge build --sizes
id: build

- name: Run Forge tests
run: |
forge test -vvv
id: test
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ Cargo.lock

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

# editor specifics
.vscode/

# foundry-specific
out/
cache/

.env
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lib/forge-std"]
path = lib/forge-std
url = https://github.com/foundry-rs/forge-std
84 changes: 83 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,83 @@
# foundry-multichain-deploy
# foundry-multichain-deploy

> **Warning**
>
> Only testnet multichain deployment is available. Mainnet deployment will be enabled soon!

Provides `foundry` tooling for the multichain deployment contract built atop Sygma. See
[ChainSafe/hardhat-plugin-multichain-deploy]("https://github.com/ChainSafe/hardhat-plugin-multichain-deploy")
for the Hardhat plugin version.

## Installation

Run `forge install chainsafe/foundry-multichain-deploy` to install this plugin to your own foundry project. You might need to use `--no-commit` so as to properly configure your git working directory and commit the dependency yourself. For further instructions, check [the official documentation.](https://book.getfoundry.sh/projects/dependencies)

## Usage

The `CrosschainDeployScript` contract is a foundry "script", which means that it
is not really deployed onto the blockchain. It provides a few helper methods
that make it easier to deal with the `CrosschainDeployAdapter` from the hardhat
repository.

To use it, first import the `CrosschainDeployScript` and inherit from it.

```solidity
// SPDX-License-Identifier: LGPL-3.0-only
pragma solidity 0.8.20
import {CrosschainDeployScript} from "foundry-multichain-deploy/src/CrosschainDeployScript.sol";

contract SampleDeployScript is CrosschainDeployScript {

function run {
// Remember that forge "builds" the contracts and stores them and their
// ABI in the root level of the `out` folder so you'd just need to use the contract
// file name and the contract name and forge gets it from the ABI.
bytes memory constructorArgs = abi.encode(uint256("10"));
bytes memory initData = abi.encode("add(uint256)", uint256(10));
addDeploymentTarget("sepolia", constructorArgs, initData);
addDeploymentTarget("holesky", constructorArgs, initData);
deploy{value: msg.value}("SimpleContract.sol:SimpleContract", 50000, false);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought about this but would it make sense to setup the constructorargs and initdatas before the contract itself? Because these are tied to the contract so it doesn't make sense that the contract name is something users have to supply in the deploy function, does it? Is there a scenario where a user would have to provide the same arguments to the same networks to another contract? But at that point, the deployment target queue is reset in the deploy function, isn't it?

(Sorry, was on the flight and saw these commits, wanted to understand more)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, contructor thing was wierd. You could have script that deploy more than one contract multichain, this ensures that you can do that

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But it's still weird, isn't it? You add deployment targets against a particular contract, but it would make sense to "fix" the contract before queuing up the arguments to its later functions. Now if someone messes up the contract name, it's a waste.

How about we give a step saying setContractString instead? And check that it has been set when someone adds deployment targets, and then set that string to "" after deploy so that our script is ready to use again?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But you can now do:

contract SampleScript is CrosschainDeployScript {

 run() {
   addDeploymentTarget("sepolia", constructorArgs, initData);
   addDeploymentTarget("holesky", constructorArgs, initData);
   deploy("SampleContract:Contract1")
   addDeploymentTarget("sepolia", constructorArgs2, initData2);
   addDeploymentTarget("holesky", constructorArgs2, initData2);
   deploy("SampleContract:SomeOtherContract")
 }

}

why would this be weird?

}
}
```

Now, you can run this with `forge script script/SampleDeployScript.sol:SampleDeployScript --rpc-url $CHAIN_RPC_URL --broadcast -vvv --verify`.

This script is not deployed, but it instead constructs the calls to the upstream
contract and broadcasts them (thanks to the `--broadcast` flag).

A good example of how to use this project is demonstrated in the
[`test/unit/CrosschainDeployScript.t.sol`](test/unit/CrosschainDeployScriptTest.t.sol)
file.

### Encoding Arguments

The `constructorArgs` and `initData` arguments use the encoded format for the
values that get passed to the adapter for deployment. Notice how in the example
above, these are encoded using `encode` and `encodePacked`.

The `SimpleContract` example has a constructor that takes a `uint256` value. So
it requires a value to be passed as `constructorArgs`. We use `bytes memory
constructorArgs = abi.encode(uint256(10));` to do so.

If a contract constructor doesn't have any input arguments, you can just use
`bytes memory constructorArgs = '';` for that particular constructor.

Now, the `add` function of the `SimpleContract` takes a `uint256` argument as
well, but to pass this to `initDatas`, you need to pass the function signature
as well. So you'd have to use `bytes memory initData =
abi.encodeWithSignature("add(uint256)", uint256(10));`. If you're calling a
function like `inc()` which takes no arguments, just say `bytes memory initData
= abi.encodeWithSignature("inc()");` instead.

To learn more, check out the ways you can use `abi.encode` and
`abi.encodeWithSignature` in the foundry book.


## Development

[Install foundry](https://book.getfoundry.sh/getting-started/installation) and [`just`](https://github.com/casey/just).

Check the `justfile` for more instructions on how to run this project. Run `just --list` to see all the options.

Note that all integration tests *should* have `Integration` in the test function name for them to work, unless you'd like to use `--match-test` specifically for those tests. However, to keep things simple, it's best to follow this practice.
6 changes: 6 additions & 0 deletions foundry.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[profile.default]
src = "src"
out = "out"
libs = ["lib"]

# See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options
40 changes: 40 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
set shell:=["bash", "-uc"]
set dotenv-load

# build the contracts
build:
forge build

# format source
fmt:
forge fmt

# run unit tests
test:
forge test --no-match-test Integration

# run integration tests, needs --fork-url
integration-test:
set -x
forge test --mt Integration --fork-url $INTEGRATION_FORK_URL -vvv

# watches the directory for changes and rebuilds.
watch-build:
forge build --watch

deploy-anvil: build
echo "Unimplemented" >&2
exit 1

deploy-sepolia: build
echo "Unimplemented" >&2
exit 1

# Builds locally using docker (useful for debugging dependency issues)
docker-build:
echo "Unimplemented" >&2
exit 1

docker-test: docker-build
echo "Unimplemented" >&2
exit 1
1 change: 1 addition & 0 deletions lib/forge-std
Submodule forge-std added at 36c303
Loading