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.

Sign up for GitHub

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

Change owner to identity operator #549

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Change owner to identity operator #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/contracts/abi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
0 => Self::Insertion,
1 => Self::Deletion,
2 => Self::Update,
_ => panic!("Invalid value for TreeChangeKind: {}", value),

Check warning on line 28 in src/contracts/abi.rs

View workflow job for this annotation

GitHub Actions / clippy

variables can be used directly in the `format!` string 

warning: variables can be used directly in the `format!` string
  --> src/contracts/abi.rs:28:18
   |
28 |             _ => panic!("Invalid value for TreeChangeKind: {}", value),
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
   = note: `#[warn(clippy::uninlined_format_args)]` implied by `#[warn(clippy::pedantic)]`
help: change this to
   |
28 -             _ => panic!("Invalid value for TreeChangeKind: {}", value),
28 +             _ => panic!("Invalid value for TreeChangeKind: {value}"),
   |

Check warning on line 28 in src/contracts/abi.rs

View workflow job for this annotation

GitHub Actions / clippy

variables can be used directly in the `format!` string 

warning: variables can be used directly in the `format!` string
  --> src/contracts/abi.rs:28:18
   |
28 |             _ => panic!("Invalid value for TreeChangeKind: {}", value),
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
   = note: `#[warn(clippy::uninlined_format_args)]` implied by `#[warn(clippy::pedantic)]`
help: change this to
   |
28 -             _ => panic!("Invalid value for TreeChangeKind: {}", value),
28 +             _ => panic!("Invalid value for TreeChangeKind: {value}"),
   |

Check warning on line 28 in src/contracts/abi.rs

View workflow job for this annotation

GitHub Actions / clippy

variables can be used directly in the `format!` string 

warning: variables can be used directly in the `format!` string
  --> src/contracts/abi.rs:28:18
   |
28 |             _ => panic!("Invalid value for TreeChangeKind: {}", value),
   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
   = note: `#[warn(clippy::uninlined_format_args)]` implied by `#[warn(clippy::pedantic)]`
help: change this to
   |
28 -             _ => panic!("Invalid value for TreeChangeKind: {}", value),
28 +             _ => panic!("Invalid value for TreeChangeKind: {value}"),
   |
}
}
}
Expand All @@ -39,6 +39,7 @@
function deleteIdentities(uint256[8] calldata deletionProof, bytes calldata packedDeletionIndices, uint256 preRoot, uint256 postRoot) public virtual
function latestRoot() public view virtual returns (uint256 root)
function owner() public view virtual returns (address)
function identityOperator() public view virtual returns (address)
function queryRoot(uint256 root) public view virtual returns (RootInfo memory)
function getRootHistoryExpiry() external view returns (uint256)
]"#,
Expand Down
9 changes: 5 additions & 4 deletions src/contracts/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,15 @@
ethereum.provider().clone(),
);

let owner = abi.owner().call().await?;
if owner != ethereum.address() {
error!(?owner, signer = ?ethereum.address(), "Signer is not the owner of the identity manager contract.");
let operator = abi.identity_operator().call().await?;
if operator != ethereum.address() {
error!(?operator, signer = ?ethereum.address(), "Signer is not the identity operator of the identity manager contract.");
panic!("Cannot currently continue in read-only mode.")
}

info!(
?address,
?owner,
?operator,
"Connected to the WorldID Identity Manager"
);

Expand Down Expand Up @@ -372,7 +373,7 @@
.await?
.context("Missing tx")?;

use ethers::abi::AbiDecode;

Check warning on line 376 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:376:9
    |
376 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`

Check warning on line 376 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:376:9
    |
376 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`

Check warning on line 376 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

adding items after statements is confusing, since items exist from the start of the scope 

warning: adding items after statements is confusing, since items exist from the start of the scope
   --> src/contracts/mod.rs:376:9
    |
376 |         use ethers::abi::AbiDecode;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#items_after_statements
    = note: `#[warn(clippy::items_after_statements)]` implied by `#[warn(clippy::pedantic)]`
let delete_identities = DeleteIdentitiesCall::decode(&tx.input)?;

let packed_deletion_indices: &[u8] = delete_identities.packed_deletion_indices.as_ref();
Expand All @@ -380,7 +381,7 @@

tracing::error!("unpacked = {indices:?}");

let padding_index = 2u32.pow(self.tree_depth as u32);

Check warning on line 384 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:384:38
    |
384 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
384 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 384 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:384:38
    |
384 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
384 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Check warning on line 384 in src/contracts/mod.rs

View workflow job for this annotation

GitHub Actions / clippy

casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers 

warning: casting `usize` to `u32` may truncate the value on targets with 64-bit wide pointers
   --> src/contracts/mod.rs:384:38
    |
384 |         let padding_index = 2u32.pow(self.tree_depth as u32);
    |                                      ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: if this is intentional allow the lint with `#[allow(clippy::cast_possible_truncation)]` ...
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#cast_possible_truncation
    = note: `#[warn(clippy::cast_possible_truncation)]` implied by `#[warn(clippy::pedantic)]`
help: ... or use `try_from` and handle the error accordingly
    |
384 |         let padding_index = 2u32.pow(u32::try_from(self.tree_depth));
    |                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Ok(indices
.into_iter()
Expand Down
Loading