Refactor smart contract (#141)

* Refactor smart contract * Code review fixes * Add onlyOwner modifier * Code review refactorings
summa-dev · Sep 1, 2023 · ddc6f08 · ddc6f08
1 parent 90c4242
commit ddc6f08
Show file tree

Hide file tree

Showing 29 changed files with 6,709 additions and 14,515 deletions.
diff --git a/backend/build.rs b/backend/build.rs
@@ -2,27 +2,7 @@ use ethers::prelude::Abigen;
 use std::{fs::OpenOptions, io::Write, path::PathBuf};
 
 fn main() {
-    let contracts = vec![
-        (
-            "src/contracts/generated/erc20_balance_retriever.rs",
-            "ERC20BalanceRetriever",
-            "ERC20BalanceRetriever",
-        ),
-        (
-            "src/contracts/generated/eth_balance_retriever.rs",
-            "ETHBalanceRetriever",
-            "ETHBalanceRetriever",
-        ),
-        (
-            "src/contracts/generated/evm_address_verifier.rs",
-            "EVMAddressVerifier",
-            "EVMAddressVerifier",
-        ),
-        (
-            "src/contracts/generated/mock_erc20.rs",
-            "MockERC20",
-            "MockERC20",
-        ),
+    let contracts = [
         (
             "src/contracts/generated/summa_contract.rs",
             "Summa",

diff --git a/backend/src/apis/fetch.rs b/backend/src/apis/fetch.rs
@@ -41,7 +41,7 @@ pub async fn fetch_asset_sums<'a, M: Middleware + 'a>(
     for contract in &token_contracts {
         for addr in exchange_addresses.clone() {
             let token_balance = contract.get_token_balance(addr).call().await.unwrap();
-            sum_token_balance = sum_token_balance + token_balance;
+            sum_token_balance += token_balance;
         }
         result.push(sum_token_balance)
     }
@@ -53,7 +53,7 @@ pub async fn fetch_asset_sums<'a, M: Middleware + 'a>(
 mod tests {
     use super::*;
 
-    use crate::contracts::generated::mock_erc20::MockERC20;
+    use crate::contracts::mock::mock_erc20::MockERC20;
     use crate::contracts::tests::initialize_anvil;
 
     #[tokio::test]

diff --git a/backend/src/contracts/abi/ERC20BalanceRetriever.json b/backend/src/contracts/abi/ERC20BalanceRetriever.json
diff --git a/backend/src/contracts/abi/ETHBalanceRetriever.json b/backend/src/contracts/abi/ETHBalanceRetriever.json
diff --git a/backend/src/contracts/abi/EVMAddressVerifier.json b/backend/src/contracts/abi/EVMAddressVerifier.json
diff --git a/backend/src/contracts/abi/MockERC20.json b/backend/src/contracts/abi/MockERC20.json
diff --git a/backend/src/contracts/abi/Summa.json b/backend/src/contracts/abi/Summa.json
diff --git a/backend/src/contracts/deployments.json b/backend/src/contracts/deployments.json
@@ -1 +1 @@
-{"31337":{"address":"0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"}}
+{ "31337": { "address": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707" } }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"31337":{"address":"0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9"}}
		{ "31337": { "address": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707" } }