Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Feature branch: Integrate IPC Solidity contracts #221

Merged
merged 102 commits into from
Jul 12, 2023
Merged

Feature branch: Integrate IPC Solidity contracts #221

merged 102 commits into from
Jul 12, 2023

Conversation

cryptoAtwill
Copy link
Contributor

@cryptoAtwill cryptoAtwill commented Jun 8, 2023 •
edited by adlrocha
Loading

Update

This branch is becoming the base feature branch for the integration of the IPC Solidity actors with the IPC agent.

Config update PR

Update the config to a new format that supports both FVM and EVM. Sample format:

[server]
json_rpc_address = "127.0.0.1:3030"

[[subnets]]
id = "/r123"
network_name = "test"

[subnets.config]
network_type = "fvm"
gateway_addr = "f01"
jsonrpc_api_http = "http://127.0.0.1:3030/rpc/v1"
accounts = ["f01", "f01"]

[[subnets]]
id = "/r1234"
network_name = "test2"

[subnets.config]
network_type = "evm"
provider_http = "http://127.0.0.1:3030/rpc/v1"
registry_addr = "0x6be1ccf648c74800380d0520d797a170c808b624"
gateway_addr = "0x6be1ccf648c74800380d0520d797a170c808b624"
private_key = "0x6BE1Ccf648c74800380d0520D797a170c808b624"
accounts = ["0x6be1ccf648c74800380d0520d797a170c808b624", "0x6be1ccf648c74800380d0520d797a170c808b624"]

All direct field access are changed to getter functions.

@cryptoAtwill cryptoAtwill changed the base branch from main to dev June 8, 2023 09:41
@cryptoAtwill cryptoAtwill requested a review from adlrocha June 8, 2023 09:41
adlrocha
adlrocha approved these changes Jun 8, 2023
View reviewed changes
Copy link
Contributor

@adlrocha adlrocha left a comment

Choose a reason for hiding this comment

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

Amazing job! LGTM. I added a few suggestions but with those settled feel free to merge.

Cargo.toml Outdated Show resolved Hide resolved
src/config/deserialize.rs Outdated Show resolved Hide resolved
src/config/mod.rs Show resolved Hide resolved
src/config/deserialize.rs Show resolved Hide resolved
@cryptoAtwill @adlrocha
Update src/config/deserialize.rs
38c5adb 
Co-authored-by: adlrocha <adlrocha@tutamail.com>
@adlrocha adlrocha changed the title Update config Feature branch: Integrate IPC Solidity contracts Jun 9, 2023
@adlrocha adlrocha mentioned this pull request Jun 9, 2023
Closed
cryptoAtwill and others added 23 commits June 9, 2023 18:58
create and join for evm
c6e4e7b
update abi
004fc6c
update ethers
8a95e35
update params
d0195b1
add debug log
a54c2b9
temp solution
a50a9ba
log more
72dc566
swap order
01136e2
add root
3469169
update create subnet constructor
fd19f45
use u128 for value over u64
09aaeba
@cryptoAtwill @adlrocha
Update src/manager/evm.rs
af86a96 
Co-authored-by: adlrocha <adlrocha@tutamail.com>
@cryptoAtwill @adlrocha
Update src/manager/evm.rs
bf0a59a 
Co-authored-by: adlrocha <adlrocha@tutamail.com>
@cryptoAtwill @adlrocha
Update src/manager/evm.rs
b6fb431 
Co-authored-by: adlrocha <adlrocha@tutamail.com>
@cryptoAtwill @adlrocha
Update src/manager/evm.rs
f3e3a08 
Co-authored-by: adlrocha <adlrocha@tutamail.com>
update based on review
feed6d4
update ipc crate
3f789f4
update evm
ecf0157
update route
e57643b
update subnet registry abi
1fe2073
fix err
690350b
fix err
9d08ecf
update route
7d96ce4
cryptoAtwill and others added 27 commits June 30, 2023 16:01
fix get top down messages with nonce
84a3c4d
add more logs
369933b
fix type conversion
f3d21fd
more logs in error
411440a
more logs to conversion
2cb477e
tmp fix bottom up ipc address
6a9e4ee
diff address
0835a97
log error
d8e2252
more logs
5be5b97
fix value conversioin
3ce2ef9
update types
342a6a1
update tests
c6d806b
update cargo
cff31d4
update crate versions
070c44b
fix test
bb6ad70
@adlrocha
Apply suggestions from code review
918893c
@adlrocha
fix fmt
375e2ed
@adlrocha
address review
94b5642
@cryptoAtwill @adlrocha
Fevm checkpoint (#228)
2441228 
* create and join for evm

* update abi

* update ethers

* update params

* add debug log

* temp solution

* log more

* swap order

* add root

* update create subnet constructor

* use u128 for value over u64

* Update src/manager/evm.rs

Co-authored-by: adlrocha <adlrocha@tutamail.com>

* Update src/manager/evm.rs

Co-authored-by: adlrocha <adlrocha@tutamail.com>

* Update src/manager/evm.rs

Co-authored-by: adlrocha <adlrocha@tutamail.com>

* Update src/manager/evm.rs

Co-authored-by: adlrocha <adlrocha@tutamail.com>

* update based on review

* update ipc crate

* update evm

* update route

* update subnet registry abi

* fix err

* fix err

* update route

* lint

* generalize checkpointing (#227)

* initial commit

* update subnet id contract

* initial commit

* add submit checkpoint placeholder:

* lint

* add checkpoint skeleton

* update get bottom up checkpoints

* update crates

* add list top down msgs

* Updates from Integration testing (#230)

* update evm config

* update no create subnet

* Fevm fvm checkpoint (#232)

* wip

* update new checkpoint

* initial bottom up impl

* Update src/manager/evm/conversion.rs

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>

* Update src/manager/evm/conversion.rs

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>

* Initial impl for top down (#233)

* initial impl for top down

* lint

* merge files

---------

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>

---------

Co-authored-by: adlrocha <adlrocha@tutamail.com>
Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>
@adlrocha
Merge branch 'fix_bottom_up' into update_config
da72dc5 
Signed-off-by: Alfonso de la Rocha <adlrocha@tutamail.com>
fix linting
bc240d9
update test infra
7c529cb
update tests
998e7ea
@adlrocha
increase timeout to support mainnet/calibration (#250)
923b5c9
@cryptoAtwill @adlrocha
Add evm key store (#245)
75a363f 
* add evm key store

* add headers

* fix formatting

* relax trait bound

* update trait bound

* add features

* add features

* add more tests

* lint

* shift code location

* lint

* Integrate evm key store (#249)

* initial impl

* change address type

* integrate evm key store

* fix provider

* remove private key in config

* rename fvm_keystore to fvm_wallet

* Import evm wallet (#251)

* import evm wallet

* lint

* Fix keystore after integration testing (#252)

* fix evm key store filename

* fix evm key store filename

* hex encode evm private key

* add missing crate

* more logs

* log

* fix join subnet

* fix join subnet

* fix top down target subnet to parent

* fix top down target subnet to child

* fix itest

* fix create itest

* itest use agent from

* Update identity/src/evm/persistent.rs

---------

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>

---------

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>

* Fix evm keystore comments (#253)

* increase timeout to support mainnet/calibration (#250)

* fix comments

* update comment

* update comment

* specify key type for fvm keys

* fix serde type

* lint

* lint

* fix import evm format

* increase timeout

* List subnet (#254)

* add subnet support

* update status mapping

* update gateway abi

---------

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>
Co-authored-by: Alfonso de la Rocha <adlrocha@tutamail.com>

---------

Co-authored-by: adlrocha <6717133+adlrocha@users.noreply.github.com>
Co-authored-by: Alfonso de la Rocha <adlrocha@tutamail.com>
@cryptoAtwill
Import private key for evm (#255)
e01a905 
* import private key for evm

* handle 0x
@adlrocha @jsoares
docs to deploy IPC Solidity in calibration (#246)
c309521 
* docs to deploy IPC Solidity in calibration

* update with evm support

* Update docs/calibration-solidity.md

Co-authored-by: Jorge Soares <547492+jsoares@users.noreply.github.com>

---------

Co-authored-by: Jorge Soares <547492+jsoares@users.noreply.github.com>
@adlrocha adlrocha merged commit 0d7db4e into dev Jul 12, 2023
@adlrocha adlrocha deleted the update_config branch July 12, 2023 15:45
@adlrocha adlrocha mentioned this pull request Jul 12, 2023
Closed
6 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@adlrocha adlrocha adlrocha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cryptoAtwill @adlrocha