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

Dropper #53

Open
wants to merge 58 commits into
base: main
Choose a base branch
from
+52,076 −26
Open

Dropper #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9ecf196
Initial Contract Copy from dropper
mrk-hub Aug 7, 2024
9326b16
Modified/updated imports and constructor requirements
mrk-hub Aug 7, 2024
b6ca616
folder name change
mrk-hub Aug 7, 2024
976c938
Removed non-dropper files, Seperated independent system out of droppe…
mrk-hub Aug 7, 2024
10ae407
terminus and diamond added to Make file
mrk-hub Aug 12, 2024
6400e89
Dropper seer generation
mrk-hub Aug 13, 2024
6b8b33a
Updating cli
mrk-hub Aug 13, 2024
e3ab8b8
Updating cli
mrk-hub Aug 13, 2024
e9199bd
update
mrk-hub Aug 13, 2024
bdcc975
update
mrk-hub Aug 13, 2024
680dd7c
Diamond launch successfull
mrk-hub Aug 13, 2024
9974e3f
Added override compile for TerminusFacet.sol
mrk-hub Aug 13, 2024
12becbe
Terminus able to be launched through CLI
mrk-hub Aug 13, 2024
3f91fca
Started dropper gogogo need
mrk-hub Aug 13, 2024
f922530
Seperating Diamonds
mrk-hub Aug 18, 2024
beef3be
Removed Standalone Diamond
mrk-hub Aug 18, 2024
c833c8c
Able to launch Dropper V2 with modifacations to DropperFacet.sol addi…
mrk-hub Aug 19, 2024
940903c
Altered to do seconds instead of block number
mrk-hub Aug 19, 2024
1d6d267
Changed IERC721Reciever to ERC721Holder
mrk-hub Aug 19, 2024
de04361
Added Native Token Distribution
mrk-hub Aug 19, 2024
fe51903
Admin Withdrawal Native Token
mrk-hub Aug 19, 2024
f4d49bb
Added Flash Drop limited number of possible claims
mrk-hub Aug 19, 2024
5feffb8
Fixed typo
mrk-hub Aug 19, 2024
377d4ba
WPT-109, Changed Flash Drops to be based on tokens claimed over numbe…
mrk-hub Aug 22, 2024
cb4b6ae
Removed tha ability to turn flash back on after total tokens are clai…
mrk-hub Aug 22, 2024
79f0d5c
altered folder
mrk-hub Aug 22, 2024
2f52312
Scripted for launch Issue with gas uint64 overflow
mrk-hub Aug 23, 2024
33e5b9f
Updated TokenType lib, Forced Flashdrops to only distribute the allot…
mrk-hub Aug 26, 2024
da8b542
Merge remote-tracking branch 'origin' into dropper
mrk-hub Aug 26, 2024
4e0fb06
Adjusted Flashdrops based on Notes and comments
mrk-hub Aug 27, 2024
c95866b
Removed mock files that were migrated from Moonstream Dropper
mrk-hub Aug 29, 2024
cad15fb
Used prettier to format. Removed Dropper V1. Added Comment
mrk-hub Aug 29, 2024
aad7ed8
Add diamond-3-hardhat as a submodule
mrk-hub Sep 4, 2024
0689c00
Moved diamond folder into each portion
mrk-hub Sep 9, 2024
713ecda
Created Security Folder and moved terminus into it
mrk-hub Sep 9, 2024
46a6345
Updated Makefile
mrk-hub Sep 9, 2024
715b8ce
Updated Go files
mrk-hub Sep 9, 2024
3554129
Testing dropperV3
mrk-hub Sep 17, 2024
7fbe081
Added more test cases
mrk-hub Sep 18, 2024
7c8b0df
Responded to Comments and Concerns for the PR#53
mrk-hub Sep 22, 2024
5cf23e4
Claim For
mrk-hub Sep 23, 2024
511d578
Updated with claimFor and adjust _claim to recieve the recipient of t…
mrk-hub Sep 24, 2024
287a249
Merged with main
mrk-hub Sep 25, 2024
6b58cf3
Formatting
mrk-hub Sep 25, 2024
abe5642
Removed claimFor and batchClaimFor and made the logic default in clai…
mrk-hub Sep 25, 2024
9a544e0
updated claim tests to recieve recipient
mrk-hub Sep 25, 2024
f834a43
Merge remote-tracking branch 'origin' into dropper
mrk-hub Oct 2, 2024
aa40a9b
created internalChecks to each function overload on _claim
mrk-hub Oct 3, 2024
95037de
Removed Calldata functions
mrk-hub Oct 16, 2024
a6607fb
Merge branch 'main' into dropper
mrk-hub Oct 16, 2024
3bc6854
Updated Branch
mrk-hub Oct 16, 2024
f86299d
Reran build
mrk-hub Oct 17, 2024
0cd4ca6
Fixed duplicate test
mrk-hub Oct 17, 2024
64bf07f
Update
mrk-hub Oct 17, 2024
0eb4af1
adjusted for case sensitivity
mrk-hub Oct 17, 2024
d1f2d81
Update
mrk-hub Oct 17, 2024
10d4115
updated case sensitivity
mrk-hub Oct 17, 2024
c9278a9
Updated Terminus to match bindings
mrk-hub Oct 17, 2024
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "web3/lib/forge-std"]
path = web3/lib/forge-std
url = https://github.com/foundry-rs/forge-std

45 changes: 43 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,52 @@ bindings/Metronome/Metronome.go: hardhat
seer evm generate --package Metronome --output bindings/Metronome/Metronome.go --hardhat web3/artifacts/contracts/metronome/Metronome.sol/Metronome.json --cli --struct Metronome


bindings/Terminus.go: hardhat
mkdir -p bindings/security/Terminus/ERC1155WithTerminusStorage
seer evm generate --package ERC1155WithTerminusStorage --output bindings/security/Terminus/ERC1155WithTerminusStorage/ERC1155WithTerminusStorage.go --hardhat web3/artifacts/contracts/security/terminus/ERC1155WithTerminusStorage.sol/ERC1155WithTerminusStorage.json --cli --struct ERC1155WithTerminusStorage
mkdir -p bindings/security/Terminus/TerminusFacet
seer evm generate --package TerminusFacet --output bindings/security/Terminus/TerminusFacet/TerminusFacet.go --hardhat web3/artifacts/contracts/security/terminus/TerminusFacet.sol/TerminusFacet.json --cli --struct TerminusFacet
mkdir -p bindings/security/Terminus/TerminusInitializer
seer evm generate --package TerminusInitializer --output bindings/security/Terminus/TerminusInitializer/TerminusInitializer.go --hardhat web3/artifacts/contracts/security/terminus/TerminusInitializer.sol/TerminusInitializer.json --cli --struct TerminusInitializer
mkdir -p bindings/security/Terminus/diamond/DiamondTerminus
seer evm generate --package DiamondTerminus --output bindings/security/Terminus/diamond/DiamondTerminus/DiamondTerminus.go --hardhat web3/artifacts/contracts/security/terminus/diamond/DiamondTerminus.sol/DiamondTerminus.json --cli --struct DiamondTermiuns
mkdir -p bindings/security/Terminus/diamond/facets/TerminusDiamondCutFacet
seer evm generate --package TerminusDiamondCutFacet --output bindings/security/Terminus/diamond/facets/TerminusDiamondCutFacet/TerminusDiamondCutFacet.go --hardhat web3/artifacts/contracts/security/terminus/diamond/facets/TerminusDiamondCutFacet.sol/TerminusDiamondCutFacet.json --cli --struct TerminusDiamondCutFacet
mkdir -p bindings/security/Terminus/diamond/facets/TerminusDiamondLoupeFacet
seer evm generate --package TerminusDiamondLoupeFacet --output bindings/security/Terminus/diamond/facets/TerminusDiamondLoupeFacet/TerminusDiamondLoupeFacet.go --hardhat web3/artifacts/contracts/security/terminus/diamond/facets/TerminusDiamondLoupeFacet.sol/TerminusDiamondLoupeFacet.json --cli --struct TerminusDiamondLoupeFacet
mkdir -p bindings/security/Terminus/diamond/facets/TerminusOwnershipFacet
seer evm generate --package TerminusOwnershipFacet --output bindings/security/Terminus/diamond/facets/TerminusOwnershipFacet/TerminusOwnershipFacet.go --hardhat web3/artifacts/contracts/security/terminus/diamond/facets/TerminusOwnershipFacet.sol/TerminusOwnershipFacet.json --cli --struct TerminusOwnershipFacet

bindings/Dropper/DropperV2.go: hardhat
mkdir -p bindings/Dropper/DropperV2
seer evm generate --package DropperFacet --output bindings/Dropper/DropperV2/DropperFacet.go --hardhat web3/artifacts/contracts/drops/dropperv2/DropperFacet.sol/DropperFacet.json --cli --struct DropperFacet
mkdir -p bindings/Dropper/DropperV2/Diamond/DiamondDropperV2
seer evm generate --package DiamondDropperV2 --output bindings/Dropper/DropperV2/Diamond/DiamondDropperV2/DiamondDropperV2.go --hardhat web3/artifacts/contracts/drops/dropperv2/diamond/DiamondDropperV2.sol/DiamondDropperV2.json --cli --struct DiamondDropperV2
mkdir -p bindings/Dropper/DropperV2/Diamond/facets/DropperV2CutFacet
seer evm generate --package DropperV2CutFacet --output bindings/Dropper/DropperV2/Diamond/facets/DropperV2CutFacet/DropperV2CutFacet.go --hardhat web3/artifacts/contracts/drops/dropperv2/diamond/facets/DropperV2CutFacet.sol/DropperV2CutFacet.json --cli --struct DropperV2CutFacet
mkdir -p bindings/Dropper/DropperV2/Diamond/facets/DropperV2LoupeFacet
seer evm generate --package DropperV2LoupeFacet --output bindings/Dropper/DropperV2/Diamond/facets/DropperV2LoupeFacet/DropperV2LoupeFacet.go --hardhat web3/artifacts/contracts/drops/dropperv2/diamond/facets/DropperV2LoupeFacet.sol/DropperV2LoupeFacet.json --cli --struct DropperV2LoupeFacet
mkdir -p bindings/Dropper/DropperV2/Diamond/facets/DropperV2OwnershipFacet
seer evm generate --package DropperV2OwnershipFacet --output bindings/Dropper/DropperV2/Diamond/facets/DropperV2OwnershipFacet/DropperV2OwnershipFacet.go --hardhat web3/artifacts/contracts/drops/dropperv2/diamond/facets/DropperV2OwnershipFacet.sol/DropperV2OwnershipFacet.json --cli --struct DropperV2OwnershipFacet

bindings/Dropper/DropperV3.go: hardhat
mkdir -p bindings/Dropper/DropperV3
seer evm generate --package DropperV3Facet --output bindings/Dropper/DropperV3/DropperV3Facet.go --hardhat web3/artifacts/contracts/drops/dropper-V3/DropperV3Facet.sol/DropperV3Facet.json --cli --struct DropperV3Facet
mkdir -p bindings/Dropper/DropperV3/Diamond/DiamondDropperV3
seer evm generate --package DiamondDropperV3 --output bindings/Dropper/DropperV3/Diamond/DiamondDropperV3/DiamondDropperV3.go --hardhat web3/artifacts/contracts/drops/dropper-V3/diamond/DiamondDropperV3.sol/DiamondDropperV3.json --cli --struct DiamondDropperV3
mkdir -p bindings/Dropper/DropperV3/Diamond/facets/DropperV3CutFacet
seer evm generate --package DropperV3CutFacet --output bindings/Dropper/DropperV3/Diamond/facets/DropperV3CutFacet/DropperV3CutFacet.go --hardhat web3/artifacts/contracts/drops/dropper-V3/diamond/facets/DropperV3CutFacet.sol/DropperV3CutFacet.json --cli --struct DropperV3CutFacet
mkdir -p bindings/Dropper/DropperV3/Diamond/facets/DropperV3LoupeFacet
seer evm generate --package DropperV3LoupeFacet --output bindings/Dropper/DropperV3/Diamond/facets/DropperV3LoupeFacet/DropperV3LoupeFacet.go --hardhat web3/artifacts/contracts/drops/dropper-V3/diamond/facets/DropperV3LoupeFacet.sol/DropperV3LoupeFacet.json --cli --struct DropperV3LoupeFacet
mkdir -p bindings/Dropper/DropperV3/Diamond/facets/DropperV3OwnershipFacet
seer evm generate --package DropperV3OwnershipFacet --output bindings/Dropper/DropperV3/Diamond/facets/DropperV3OwnershipFacet/DropperV3OwnershipFacet.go --hardhat web3/artifacts/contracts/drops/dropper-V3/diamond/facets/DropperV3OwnershipFacet.sol/DropperV3OwnershipFacet.json --cli --struct DropperV3OwnershipFacet


bindings/TokenSender/TokenSender.go: hardhat
mkdir -p bindings/TokenSender
seer evm generate --package TokenSender --output bindings/TokenSender/TokenSender.go --hardhat web3/artifacts/contracts/faucet/TokenSender.sol/TokenSender.json --cli --struct TokenSender

bindings: bindings/ERC20/ERC20.go bindings/TokenFaucet/TokenFaucet.go bindings/WrappedNativeToken/WrappedNativeToken.go bindings/Staker/Staker.go bindings/MockERC20/MockERC20.go bindings/MockERC721/MockERC721.go bindings/MockERC1155/MockERC1155.go bindings/PositionMetadata/PositionMetadata.go bindings/Metronome/Metronome.go bindings/TokenSender/TokenSender.go
bindings: bindings/ERC20/ERC20.go bindings/TokenFaucet/TokenFaucet.go bindings/WrappedNativeToken/WrappedNativeToken.go bindings/Staker/Staker.go bindings/MockERC20/MockERC20.go bindings/MockERC721/MockERC721.go bindings/MockERC1155/MockERC1155.go bindings/PositionMetadata/PositionMetadata.go bindings/Metronome/Metronome.go bindings/Terminus.go bindings/Dropper/DropperV2.go bindings/Dropper/DropperV3.go bindings/TokenSender/TokenSender.go

test-web3:
cd web3 && npx hardhat test
Expand All @@ -75,7 +116,7 @@ test-graffiti:
test: test-web3 test-graffiti

clean:
rm -rf bindings/ERC20/* bin/* bindings/TokenFaucet/* bindings/WrappedNativeToken/* bindings/Staker/* bindings/MockERC20/* bindings/MockERC721/* bindings/MockERC1155/* bindings/PositionMetadata/* bindings/TokenSender/*
rm -rf bindings/ERC20/* bin/* bindings/TokenFaucet/* bindings/WrappedNativeToken/* bindings/Staker/* bindings/MockERC20/* bindings/MockERC721/* bindings/MockERC1155/* bindings/Diamond/* bindings/security/* bindings/Dropper bindings/PositionMetadata/* bindings/TokenSender/*

clean-web3:
rm -rf web3/node_modules web3/artifacts
Expand Down
Loading
Loading