updated contracts

greenpill-dev-guild · Mar 13, 2024 · e371471 · e371471
1 parent 34fa430
commit e371471
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -10,7 +10,8 @@
     "lint": "pnpm run prettier && pnpm run solhint",
     "anvil": "source .env && anvil --fork-url $ANVIL_FORK_URL --chain-id $ANVIL_CHAIN_ID",
     "build": "forge build",
-    "deploy:local": "pnpm run build && mud deploy",
+    "test": "pnpm run build && forge test -f https://sepolia.base.org --gas-report",
+    "deploy:local9": "pnpm run build && mud deploy",
     "deploy:base": "source .env && FOUNDRY_PROFILE=base forge script script/Base.s.sol:BaseScript --private-key $FORGE_PRIVATE_KEY --etherscan-api-key $ETHERSCAN_API_KEY --broadcast",
     "deploy:base-sepolia": "source .env && FOUNDRY_PROFILE=base-sepolia forge script script/BaseGoerli.s.sol:BaseScript --private-key $FORGE_PRIVATE_KEY --etherscan-api-key $ETHERSCAN_API_KEY --broadcast"
   },

diff --git a/packages/contracts/src/accounts/Campaign.sol b/packages/contracts/src/accounts/Campaign.sol
@@ -82,7 +82,7 @@ contract CampaignAccount is AccountV3Upgradable, Initializable {
         uint256 _contributionId
     ) external {
         // this is throwing when it should not, not sure why.
-        if (msgSender() != confirmationResolver) {
+        if (_msgSender() != confirmationResolver) {
             revert NotConfirmationResolver();
         }
 

diff --git a/packages/contracts/src/resolvers/Confirmation.sol b/packages/contracts/src/resolvers/Confirmation.sol
@@ -13,7 +13,7 @@ error NotAllowed();
 
 /// @title ConfirmationResolver
 /// @notice A schema resolver for the Confirmations event schema
-contract ConfirmationResolver is SchemaResolver, Initializable, OwnableUpgradeable, UUPSUpgradeable {
+contract ConfirmationResolver is SchemaResolver, OwnableUpgradeable, UUPSUpgradeable {
     struct ConfirmationSchema {
         uint256  contributionId;
         bool approval;

diff --git a/packages/contracts/src/resolvers/Contribution.sol b/packages/contracts/src/resolvers/Contribution.sol
@@ -13,7 +13,7 @@ error NotOwner();
 
 /// @title ContributionResolver
 /// @notice A schema resolver for the Contributions event schema
-contract ContributionResolver is SchemaResolver, Initializable, OwnableUpgradeable, UUPSUpgradeable {
+contract ContributionResolver is SchemaResolver, OwnableUpgradeable, UUPSUpgradeable {
     struct ContributionSchema {
         uint256 value;
         string title;

diff --git a/packages/contracts/src/tokens/Campaign.sol b/packages/contracts/src/tokens/Campaign.sol
@@ -12,7 +12,7 @@ import { TBALib } from "../lib/TBA.sol";
 contract CampaignToken is ERC721 {
     using Strings for uint256;
 
-    event CampaignCreated(address indexed owner, address indexed tba, /*uint256 hypercertId,*/ string[] capitals, string metadata);
+    event CampaignCreated(address indexed creator, address indexed tba, /*uint256 hypercertId,*/ string[] capitals, string metadata);
 
     address private implementation;
     address private confirmationResolver;
@@ -49,7 +49,7 @@ contract CampaignToken is ERC721 {
 
         uint256 hypeId = CampaignAccount(payable(campaignAddrs)).initialize(_startDate, _endDate, _metadata, _capitals, _team, hypercert);
 
-        emit CampaignCreated(msg.sender, campaignAddrs, hypeId, _capitals, _metadata);
+        emit CampaignCreated(msg.sender, campaignAddrs, _capitals, _metadata);
 
         return(campaignAddrs, hypeId);
     }