Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Devnet Build #1073

Merged
merged 12 commits into from
Apr 26, 2021
Merged

Devnet Build #1073

merged 12 commits into from
Apr 26, 2021

Conversation

ec2
Copy link
Member

@ec2 ec2 commented Apr 13, 2021

Summary of changes
Changes introduced in this pull request:

  • make devnet to build Forest in devnet mode.

Reference issue to close (if applicable)

Closes

Other information and links

@ec2 ec2 marked this pull request as ready for review April 20, 2021 19:16
@ec2 ec2 requested a review from a user April 20, 2021 19:16
@ec2 ec2 requested a review from creativcoder April 20, 2021 20:16
@@ -190,7 +190,7 @@ where
}
let nonce = data.mpool.get_sequence(&from).await?;
umsg.sequence = nonce;
let key = wallet::find_key(&key_addr, &*keystore)?;
let key = wallet::Key::try_from(wallet::try_find(&key_addr, &mut *keystore)?)?;
Copy link
Contributor

Choose a reason for hiding this comment

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

If you think &mut * looks unclean, there's deref_mut (keystore.deref_mut()) method as well (but it needs an import of std::ops::DerefMut).

Copy link
Contributor

@cryptoquick cryptoquick left a comment

Choose a reason for hiding this comment

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

One question, and also, I can't get this to compile:

   Compiling filecoin-proofs v6.1.0
   Compiling libp2p v0.35.1
   Compiling filecoin-proofs-api v6.1.0
   Compiling fil_types v0.1.11 (/home/hunter/Projects/chainsafe/forest-devnet/types)
   Compiling forest_message v0.7.2 (/home/hunter/Projects/chainsafe/forest-devnet/vm/message)
   Compiling networks v0.1.0 (/home/hunter/Projects/chainsafe/forest-devnet/types/networks)
   Compiling paramfetch v0.1.0 (/home/hunter/Projects/chainsafe/forest-devnet/utils/paramfetch)
error[E0659]: `UPGRADE_BREEZE_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:43:17
   |
43 |         height: UPGRADE_BREEZE_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_BREEZE_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_BREEZE_HEIGHT` to disambiguate
note: `UPGRADE_BREEZE_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_BREEZE_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_SMOKE_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:47:17
   |
47 |         height: UPGRADE_SMOKE_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_SMOKE_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_SMOKE_HEIGHT` to disambiguate
note: `UPGRADE_SMOKE_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_SMOKE_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_IGNITION_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:51:17
   |
51 |         height: UPGRADE_IGNITION_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_IGNITION_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_IGNITION_HEIGHT` to disambiguate
note: `UPGRADE_IGNITION_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_IGNITION_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_ACTORS_V2_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:55:17
   |
55 |         height: UPGRADE_ACTORS_V2_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_ACTORS_V2_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ACTORS_V2_HEIGHT` to disambiguate
note: `UPGRADE_ACTORS_V2_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ACTORS_V2_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_TAPE_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:59:17
   |
59 |         height: UPGRADE_TAPE_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_TAPE_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_TAPE_HEIGHT` to disambiguate
note: `UPGRADE_TAPE_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_TAPE_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_KUMQUAT_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:63:17
   |
63 |         height: UPGRADE_KUMQUAT_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_KUMQUAT_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_KUMQUAT_HEIGHT` to disambiguate
note: `UPGRADE_KUMQUAT_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_KUMQUAT_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_CALICO_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:67:17
   |
67 |         height: UPGRADE_CALICO_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_CALICO_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_CALICO_HEIGHT` to disambiguate
note: `UPGRADE_CALICO_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_CALICO_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_PERSIAN_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:71:17
   |
71 |         height: UPGRADE_PERSIAN_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_PERSIAN_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_PERSIAN_HEIGHT` to disambiguate
note: `UPGRADE_PERSIAN_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_PERSIAN_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_ORANGE_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:75:17
   |
75 |         height: UPGRADE_ORANGE_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_ORANGE_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ORANGE_HEIGHT` to disambiguate
note: `UPGRADE_ORANGE_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ORANGE_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_ACTORS_V3_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:79:17
   |
79 |         height: UPGRADE_ACTORS_V3_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_ACTORS_V3_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ACTORS_V3_HEIGHT` to disambiguate
note: `UPGRADE_ACTORS_V3_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_ACTORS_V3_HEIGHT` to disambiguate

error[E0659]: `UPGRADE_NORWEGIAN_HEIGHT` is ambiguous (glob import vs glob import in the same module)
  --> types/networks/src/lib.rs:83:17
   |
83 |         height: UPGRADE_NORWEGIAN_HEIGHT,
   |                 ^^^^^^^^^^^^^^^^^^^^^^^^ ambiguous name
   |
note: `UPGRADE_NORWEGIAN_HEIGHT` could refer to the constant imported here
  --> types/networks/src/lib.rs:16:9
   |
16 | pub use self::mainnet::*;
   |         ^^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_NORWEGIAN_HEIGHT` to disambiguate
note: `UPGRADE_NORWEGIAN_HEIGHT` could also refer to the constant imported here
  --> types/networks/src/lib.rs:26:9
   |
26 | pub use self::devnet::*;
   |         ^^^^^^^^^^^^^^^
   = help: consider adding an explicit import of `UPGRADE_NORWEGIAN_HEIGHT` to disambiguate

error[E0659]: `DRAND_SCHEDULE` is ambiguous (glob import vs glob import in the same module)
   --> types/networks/src/lib.rs:102:56
    |
102 |     let mut points = BeaconSchedule(Vec::with_capacity(DRAND_SCHEDULE.len()));
    |                                                        ^^^^^^^^^^^^^^ ambiguous name
    |
note: `DRAND_SCHEDULE` could refer to the static imported here
   --> types/networks/src/lib.rs:16:9
    |
16  | pub use self::mainnet::*;
    |         ^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `DRAND_SCHEDULE` to disambiguate
note: `DRAND_SCHEDULE` could also refer to the static imported here
   --> types/networks/src/lib.rs:26:9
    |
26  | pub use self::devnet::*;
    |         ^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `DRAND_SCHEDULE` to disambiguate

error[E0659]: `DRAND_SCHEDULE` is ambiguous (glob import vs glob import in the same module)
   --> types/networks/src/lib.rs:103:15
    |
103 |     for dc in DRAND_SCHEDULE.iter() {
    |               ^^^^^^^^^^^^^^ ambiguous name
    |
note: `DRAND_SCHEDULE` could refer to the static imported here
   --> types/networks/src/lib.rs:16:9
    |
16  | pub use self::mainnet::*;
    |         ^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `DRAND_SCHEDULE` to disambiguate
note: `DRAND_SCHEDULE` could also refer to the static imported here
   --> types/networks/src/lib.rs:26:9
    |
26  | pub use self::devnet::*;
    |         ^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `DRAND_SCHEDULE` to disambiguate

error[E0659]: `BLOCK_DELAY_SECS` is ambiguous (glob import vs glob import in the same module)
   --> types/networks/src/lib.rs:106:59
    |
106 |             beacon: Arc::new(DrandBeacon::new(genesis_ts, BLOCK_DELAY_SECS, dc.config).await?),
    |                                                           ^^^^^^^^^^^^^^^^ ambiguous name
    |
note: `BLOCK_DELAY_SECS` could refer to the constant imported here
   --> types/networks/src/lib.rs:16:9
    |
16  | pub use self::mainnet::*;
    |         ^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `BLOCK_DELAY_SECS` to disambiguate
note: `BLOCK_DELAY_SECS` could also refer to the constant imported here
   --> types/networks/src/lib.rs:26:9
    |
26  | pub use self::devnet::*;
    |         ^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `BLOCK_DELAY_SECS` to disambiguate

error: aborting due to 14 previous errors

For more information about this error, try `rustc --explain E0659`.
error: could not compile `networks`

To learn more, run the command again with --verbose.
warning: build failed, waiting for other jobs to finish...
error: build failed
make: *** [Makefile:61: devnet] Error 101

key_management/src/wallet.rs Show resolved Hide resolved
@ec2
Copy link
Member Author

ec2 commented Apr 23, 2021

Ah shoot, i broke some stuff. Lemme take a look. Feature flag propagating is annoying af.

Copy link
Contributor

@cryptoquick cryptoquick left a comment

Choose a reason for hiding this comment

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

This compiles now and does seem to be working.

@ec2 ec2 merged commit 0a134af into main Apr 26, 2021
@ec2 ec2 deleted the ec2/devnet-audit-prep branch April 26, 2021 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants