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

chore: add updates #22

Merged
merged 222 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
3c815c0
feat: Arbitrum contract and deployment scripts
kupermind Nov 27, 2024
df726d9
chore: further refactor
kupermind Nov 27, 2024
bea1352
chore: comment
kupermind Nov 27, 2024
f954206
chore: add updates
DavidMinarsch Nov 28, 2024
f69d638
refactor: intermediate
kupermind Nov 28, 2024
606acf4
chore: comments
kupermind Nov 29, 2024
4a8c589
doc: initial internal audit
Nov 29, 2024
7110bba
doc: initial internal audit
Nov 29, 2024
34ae39d
doc: initial internal audit
Nov 29, 2024
340f8c9
feat: initial Oracle solution, please fixing it
Nov 29, 2024
094bf65
refactor: AGNT redemption unleash
kupermind Nov 29, 2024
83eb659
refactor: redemption in MemeBase only
kupermind Nov 29, 2024
f659902
refactor: oracle
kupermind Nov 29, 2024
1464c12
chore: virtual extensions
kupermind Nov 30, 2024
cc6a990
chore: redemption logs
kupermind Nov 30, 2024
2946888
chore: memeCelo deployment scripts
kupermind Nov 30, 2024
a0c4fe0
Merge pull request #24 from dvilelaf/redemption
DavidMinarsch Nov 30, 2024
2b64d83
chore: todo comment
kupermind Nov 30, 2024
e1b34a0
feat and test: oracles
kupermind Dec 1, 2024
b7949e1
Merge pull request #25 from dvilelaf/oracle
DavidMinarsch Dec 1, 2024
04f7ec9
Merge pull request #23 from dvilelaf/v0.0.1-internal-audit
DavidMinarsch Dec 1, 2024
cb5b13f
chore: fixes to implementation
DavidMinarsch Dec 1, 2024
c3c0558
feat: real avarage in price, ChatGPT 4o
Dec 1, 2024
bc0b2ee
Merge pull request #28 from dvilelaf/test_oracle
DavidMinarsch Dec 1, 2024
b11b1a0
Merge branch 'updates' into updates-2
DavidMinarsch Dec 1, 2024
f73a774
chore: minor bug fix
DavidMinarsch Dec 1, 2024
25c8889
chore: implement uni oracle wrapper
DavidMinarsch Dec 1, 2024
61ffde1
chore: comments change
kupermind Dec 1, 2024
831f1e5
Update contracts/MemeBase.sol
DavidMinarsch Dec 1, 2024
f4a3ac0
Merge pull request #27 from dvilelaf/updates-2
DavidMinarsch Dec 1, 2024
9c116a9
Merge branch 'updates' into arbitrum
DavidMinarsch Dec 1, 2024
616a0d6
Merge pull request #21 from dvilelaf/arbitrum
DavidMinarsch Dec 1, 2024
12e534b
chore: fix compile
DavidMinarsch Dec 1, 2024
56cd1b4
chore: clean up arbitrum
DavidMinarsch Dec 1, 2024
646c0e4
test: adjusting tests
kupermind Dec 2, 2024
8df8e11
chore: start adding v3 support and collecting of LP fees
DavidMinarsch Dec 2, 2024
7d798a2
chore: fupdate readme
DavidMinarsch Dec 2, 2024
a36c866
refactor: contract-based redemption
kupermind Dec 2, 2024
4cc0208
refactor: oracle
kupermind Dec 2, 2024
f5b7c52
chore: deployment script
kupermind Dec 2, 2024
69e79ef
chore: total supply limit
kupermind Dec 2, 2024
fc5207e
chore: console logs removal
kupermind Dec 2, 2024
5d3fa11
Merge pull request #31 from dvilelaf/more_updates
DavidMinarsch Dec 2, 2024
593f0b5
refactor: oracle
kupermind Dec 2, 2024
76d40d7
Merge pull request #33 from dvilelaf/oracle_update
DavidMinarsch Dec 2, 2024
68bd7bc
Merge branch 'updates' into v3
kupermind Dec 2, 2024
844eee4
refactor: v3-compatible
kupermind Dec 2, 2024
fb6fb0c
refactor: uni v3 compilation
kupermind Dec 2, 2024
96147e7
refactor: merging it all
kupermind Dec 2, 2024
c84ea35
chore: debugging
kupermind Dec 2, 2024
ca5c156
Merge pull request #34 from dvilelaf/v3_update
DavidMinarsch Dec 2, 2024
b7a1ea5
Merge branch 'updates' into v3
DavidMinarsch Dec 2, 2024
9960825
Merge pull request #29 from dvilelaf/v3
DavidMinarsch Dec 2, 2024
16238b0
Merge pull request #35 from dvilelaf/v3_merge
DavidMinarsch Dec 2, 2024
89b812c
refactor: create and initialize the pool
kupermind Dec 2, 2024
8fffd8f
chore: fix various issues
DavidMinarsch Dec 3, 2024
7d80e21
refactor: enhancing further
kupermind Dec 3, 2024
12815a0
chore: single interface
kupermind Dec 3, 2024
66851bc
fix: correcting spacings
kupermind Dec 3, 2024
cad9cba
refactor: oracles
kupermind Dec 3, 2024
22b1cff
refactor: Uniswap TWAP
kupermind Dec 3, 2024
d53d136
refactor: Uniswap TWAP
kupermind Dec 3, 2024
2aec741
Merge pull request #36 from dvilelaf/updates2
DavidMinarsch Dec 3, 2024
a6543d0
refactor: remove swap and bridge
kupermind Dec 3, 2024
471957e
chore: native token transfer
kupermind Dec 3, 2024
87c985f
Merge pull request #38 from dvilelaf/no_bridging
DavidMinarsch Dec 3, 2024
1aeab63
chore: minor fix
DavidMinarsch Dec 3, 2024
a125c71
chore: fix test
DavidMinarsch Dec 3, 2024
fcc1f49
chore: fix position token order
DavidMinarsch Dec 3, 2024
337c3fc
refactor: code optimization and fixes
kupermind Dec 3, 2024
cc0f1bd
chore: change modifier
DavidMinarsch Dec 3, 2024
c800678
Merge branch 'fix' into optimization
DavidMinarsch Dec 3, 2024
9ddf689
Merge pull request #40 from dvilelaf/optimization
DavidMinarsch Dec 3, 2024
a6e0ece
Merge pull request #39 from dvilelaf/fix
DavidMinarsch Dec 3, 2024
dfce4a1
chore: rename to launch campaign
DavidMinarsch Dec 3, 2024
c73f7d6
Merge pull request #41 from dvilelaf/fix
kupermind Dec 3, 2024
733b1e7
refactor: srhink it
kupermind Dec 3, 2024
202d125
chore: cleaning the interface
kupermind Dec 3, 2024
5dc09b5
Merge pull request #42 from dvilelaf/refactor
DavidMinarsch Dec 3, 2024
af6fab7
feat: buy back proxy implementation
kupermind Dec 3, 2024
b4f9b9e
chore: hash correction
kupermind Dec 3, 2024
eb78c9a
chore: comment
kupermind Dec 3, 2024
c4907bf
Merge pull request #43 from dvilelaf/buy_back_proxy
DavidMinarsch Dec 3, 2024
9c8424c
Chore: fix docstring
DavidMinarsch Dec 3, 2024
c86d4e5
test and chore: removing unnecessary submodules, adding tests
kupermind Dec 3, 2024
24036a0
Merge pull request #56 from dvilelaf/polishing3
DavidMinarsch Dec 4, 2024
8e90478
fix: campaign launch
kupermind Dec 4, 2024
8e188f0
chore: bumping a version
kupermind Dec 4, 2024
594cd18
Merge pull request #57 from dvilelaf/polishing3
DavidMinarsch Dec 4, 2024
bc391ba
Cchore: more tests
DavidMinarsch Dec 4, 2024
2c6dca0
doc: internal audit 0.2.0
Dec 4, 2024
2f58aa3
doc: internal audit 0.2.0
Dec 4, 2024
0ec6a5e
refactor: account for built-in oracle to check on prices during a col…
kupermind Dec 4, 2024
2c515c0
fix: deviation with no pool activity
kupermind Dec 4, 2024
ca3f716
refactor: hash first, then meme
kupermind Dec 4, 2024
a1713f0
refactor: hash to nonce
kupermind Dec 4, 2024
1030b79
fix: small correction
kupermind Dec 4, 2024
ecc2183
refactor: corrections
kupermind Dec 4, 2024
d69e800
Merge pull request #63 from dvilelaf/hashing
kupermind Dec 4, 2024
88e426c
Merge pull request #60 from dvilelaf/twap_price_check
kupermind Dec 4, 2024
138731b
chore and test: polishing
kupermind Dec 4, 2024
c852cf0
Merge pull request #58 from dvilelaf/tests
kupermind Dec 4, 2024
10212f5
Merge pull request #64 from dvilelaf/polishing5
kupermind Dec 4, 2024
e98903e
test: adding to testing
kupermind Dec 4, 2024
91fbd3b
Update contracts/MemeFactory.sol
DavidMinarsch Dec 4, 2024
50cbf06
Merge pull request #59 from dvilelaf/v0.2.0-internal-audit
DavidMinarsch Dec 4, 2024
1621009
chore: some more tests
DavidMinarsch Dec 5, 2024
58eeed2
fix and test: fixing math
kupermind Dec 5, 2024
61b8eff
fix and test: math
kupermind Dec 5, 2024
a9e1e23
test: adding to tests
kupermind Dec 5, 2024
f16e2b7
Merge pull request #66 from dvilelaf/fix
DavidMinarsch Dec 5, 2024
e7f8574
Merge branch 'updates' into testing
DavidMinarsch Dec 5, 2024
2c335d0
Merge pull request #65 from dvilelaf/testing
DavidMinarsch Dec 5, 2024
511b9fc
Merge branch 'updates' into fix2
DavidMinarsch Dec 5, 2024
99fcc3b
chore: temp fix
DavidMinarsch Dec 6, 2024
48a5931
Merge pull request #70 from dvilelaf/fix3
DavidMinarsch Dec 6, 2024
8723957
Chore: fix some issues with loops
DavidMinarsch Dec 6, 2024
059fb7f
chore: simplifying
DavidMinarsch Dec 6, 2024
4018310
chore: finalise simplified design
DavidMinarsch Dec 6, 2024
81c735b
Merge pull request #71 from dvilelaf/fix3
DavidMinarsch Dec 6, 2024
3e3eedf
chore: minor fixes
DavidMinarsch Dec 6, 2024
9b42761
refactor: simplified ascendance, moved oracle away
kupermind Dec 6, 2024
60a439f
test: fix output
kupermind Dec 6, 2024
264b595
doc: internal audit 2
Dec 6, 2024
2447fd3
Merge pull request #69 from dvilelaf/fix2
kupermind Dec 6, 2024
a6573cd
doc: internal audit 2
Dec 6, 2024
8cc5619
doc: internal audit 2
Dec 6, 2024
7226503
chore: scripts
kupermind Dec 6, 2024
3938310
Merge pull request #72 from dvilelaf/pre-audit
DavidMinarsch Dec 6, 2024
0783cd7
refactor: addressing audit
kupermind Dec 6, 2024
d7bfeec
chore: shuffling functions around
kupermind Dec 6, 2024
a4cade2
chore: reverting back the default base network setup
kupermind Dec 6, 2024
8806ea7
Merge pull request #76 from dvilelaf/address_audit1
DavidMinarsch Dec 6, 2024
57b9ac3
Merge pull request #77 from dvilelaf/address_audit2
DavidMinarsch Dec 6, 2024
9f6e023
Merge branch 'updates' into v0.2.0-internal-audit2
kupermind Dec 6, 2024
c4326b3
Merge pull request #73 from dvilelaf/v0.2.0-internal-audit2
DavidMinarsch Dec 6, 2024
2fc0417
Merge branch 'updates' into scripts
kupermind Dec 6, 2024
b0d7073
refactor and test: collect oracle
kupermind Dec 6, 2024
0255b6a
chore: adding gas price to scripts
kupermind Dec 6, 2024
0c7fa2f
chore: small comment correction
kupermind Dec 7, 2024
85a1053
Merge pull request #75 from dvilelaf/scripts
DavidMinarsch Dec 8, 2024
7fd5d88
Merge branch 'updates' into collect_oracle
DavidMinarsch Dec 8, 2024
e40b6db
Merge pull request #78 from dvilelaf/collect_oracle
DavidMinarsch Dec 8, 2024
94c0f32
chore: cleanup
DavidMinarsch Dec 8, 2024
697f0fc
Update contracts/MemeBase.sol
DavidMinarsch Dec 8, 2024
9d725bf
Merge pull request #79 from dvilelaf/fix
DavidMinarsch Dec 9, 2024
2ec0552
chore: further bugs
DavidMinarsch Dec 9, 2024
cb8039d
chore: fix tests
DavidMinarsch Dec 9, 2024
3c7c861
Merge pull request #80 from dvilelaf/fix
kupermind Dec 9, 2024
5676173
doc: internal audits 4
Dec 9, 2024
ceacd61
chore: update TODO
kupermind Dec 9, 2024
f166f17
feat: oracle integration (Base)
kupermind Dec 9, 2024
9ee8788
feat: adding BuyBackBurnerCelo
kupermind Dec 9, 2024
c6e6b55
feat: BuyBackBurnerArbitrum
kupermind Dec 9, 2024
d3ee160
doc: internal audit5
Dec 9, 2024
f296ec3
refactor: addressing audit
kupermind Dec 9, 2024
3c24031
Merge pull request #82 from dvilelaf/v0.2.0-internal-audit3
DavidMinarsch Dec 9, 2024
a0fa016
Merge pull request #84 from dvilelaf/v0.2.0-internal-audit4
DavidMinarsch Dec 9, 2024
29bc4b2
refactor: BuyBack refactor
kupermind Dec 9, 2024
f618497
fix: correction
kupermind Dec 9, 2024
64e18a0
fix: correction
kupermind Dec 9, 2024
be126f7
Merge pull request #86 from dvilelaf/buy_back_refactor
DavidMinarsch Dec 9, 2024
1df1d1f
Merge pull request #85 from dvilelaf/post_audit03
DavidMinarsch Dec 9, 2024
08b0e87
Merge pull request #83 from dvilelaf/post_audit02
DavidMinarsch Dec 9, 2024
61d7026
refactor: oracle logic
kupermind Dec 9, 2024
0e5635f
Merge pull request #88 from dvilelaf/buy_back_refactor_oracle
DavidMinarsch Dec 9, 2024
e258f56
chore: change name
DavidMinarsch Dec 9, 2024
9882746
Merge pull request #89 from dvilelaf/agnt
kupermind Dec 9, 2024
aa7fd9c
feat: oracle and more tests
kupermind Dec 9, 2024
d4b423d
refactor: compact vars
kupermind Dec 9, 2024
9107c8f
test: adjusting tests
kupermind Dec 9, 2024
4e77462
test: more tests and adjustments
kupermind Dec 9, 2024
5059925
chore: first steps
DavidMinarsch Dec 10, 2024
090a7f4
refactor: strip bridging for now
kupermind Dec 10, 2024
2d85cf3
test: resolved collect testing
kupermind Dec 10, 2024
8627b02
doc: internal audit 6
Dec 10, 2024
75e0dac
test: adding tests
kupermind Dec 10, 2024
84c5891
test: adding tests
kupermind Dec 10, 2024
4219e1d
Merge pull request #93 from dvilelaf/v0.2.0-internal-audit5
kupermind Dec 10, 2024
949e2e7
refactor: addressing audit
kupermind Dec 10, 2024
2b08b1f
fix: bug in observations
kupermind Dec 10, 2024
5320d0b
Merge pull request #91 from dvilelaf/base-bridging
DavidMinarsch Dec 10, 2024
2514478
refactor: observations
kupermind Dec 10, 2024
065da08
Merge pull request #92 from dvilelaf/strip_bridging
DavidMinarsch Dec 10, 2024
7741a82
refactor: math and adding eth tests
kupermind Dec 10, 2024
c7099bb
chore: couple of remarks
kupermind Dec 10, 2024
0b0c152
Merge pull request #94 from dvilelaf/address_audit05
DavidMinarsch Dec 10, 2024
dc1b98d
Merge pull request #90 from dvilelaf/more_more_tests
DavidMinarsch Dec 10, 2024
1ae22e9
test: ethereum
kupermind Dec 10, 2024
c0b2d89
Merge pull request #95 from dvilelaf/refactor_and_eth
DavidMinarsch Dec 10, 2024
7756c2e
chore: deployment scripts
kupermind Dec 10, 2024
7e5090e
chore: update ABIs
kupermind Dec 10, 2024
165e413
chore: hardhat config
kupermind Dec 10, 2024
8ecc59c
chore: abis
kupermind Dec 10, 2024
647ee4c
chore: minor typos
DavidMinarsch Dec 10, 2024
896221a
chore: updating scripts
kupermind Dec 10, 2024
10780f5
Merge pull request #96 from dvilelaf/refactor_and_eth
kupermind Dec 10, 2024
6cdb31a
chore: updating ABIs
kupermind Dec 10, 2024
62565c8
chore: scripts
kupermind Dec 10, 2024
84ed8f2
chore: deployment
DavidMinarsch Dec 10, 2024
79474f1
chore: scrupts
kupermind Dec 10, 2024
0e6dcd5
chore: push base
DavidMinarsch Dec 10, 2024
b9c1e76
chore: fix meme scripts
DavidMinarsch Dec 10, 2024
8aaaf16
chore: globals base
DavidMinarsch Dec 10, 2024
43f10cb
chore: celo deploy
DavidMinarsch Dec 10, 2024
4f42aed
chore: deployments
kupermind Dec 10, 2024
00ba59a
chore: add celo info
DavidMinarsch Dec 10, 2024
7559f06
chore: rolling back cancun
kupermind Dec 11, 2024
91a527f
chore: linters
kupermind Dec 11, 2024
7e4e407
fix: linters
dvilelaf Dec 11, 2024
dd310f3
chore: linters
kupermind Dec 11, 2024
71da96f
chore: linters
kupermind Dec 11, 2024
09cbf35
chore: linters
kupermind Dec 11, 2024
9383064
chore: deployment config for arbitrum
kupermind Dec 11, 2024
0bcda20
chore: linters
kupermind Dec 11, 2024
23fe6bb
chore: abi to abis
kupermind Dec 11, 2024
dc79d96
chore: abi to abis
kupermind Dec 11, 2024
a2eae7c
chore: addresses order
kupermind Dec 11, 2024
f030539
chore: linters
kupermind Dec 11, 2024
dd459ea
chore: linters
kupermind Dec 11, 2024
26f6c7d
Merge branch 'main' into updates
dvilelaf Dec 11, 2024
a24de2f
chore: linters
kupermind Dec 11, 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
8 changes: 4 additions & 4 deletions .github/workflows/main_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Check dependencies
run: tox -e check-dependencies
- name: Check doc links
run: tomte check-doc-links
run: tomte check-doc-links --url-skips https://soft-sly-slug.base-mainnet.quiknode.pro/f13d998d9d68685faeee903499e15b4b386a8b1c/
- name: Check doc IPFS hashes
run: tox -e check-doc-hashes

Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
with:
go-version: "1.17.7"
- run: |
wget https://github.com/zricethezav/gitleaks/releases/download/v8.15.3/gitleaks_8.15.3_linux_x64.tar.gz && \
tar -xzf gitleaks_8.15.3_linux_x64.tar.gz && \
wget https://github.com/gitleaks/gitleaks/releases/download/v8.21.2/gitleaks_8.21.2_linux_x64.tar.gz && \
tar -xzf gitleaks_8.21.2_linux_x64.tar.gz && \
sudo install gitleaks /usr/bin && \
gitleaks detect --report-format json --report-path leak_report
gitleaks detect --report-format json --report-path leak_report -v
7 changes: 7 additions & 0 deletions .gitleaksignore
Original file line number Diff line number Diff line change
Expand Up @@ -374,3 +374,10 @@ a36c8662abbacb603cbb477a4233dabfe812ee22:contracts/MemeBase.sol:generic-api-key:
0bcda208e49ee4514539e7f0abb959b5dfbc4884:scripts/deployment/globals_arbitrum_one.json:generic-api-key:1
a2eae7cc6176b84e4aaa59a85321249d4a906305:scripts/deployment/globals_arbitrum_one.json:generic-api-key:1
a2eae7cc6176b84e4aaa59a85321249d4a906305:scripts/deployment/globals_celo_mainnet.json:generic-api-key:1
264b5956daeb372f99ac9de84faf1e257c81513b:audits/internal3/analysis/contracts/MemeBase-flatten.sol:generic-api-key:1303
722650392739117747fb1729f46966282186d02c:scripts/deployment/globals_arbitrum_one_meme_alpha.json:generic-api-key:15
722650392739117747fb1729f46966282186d02c:scripts/deployment/globals_arbitrum_one_meme_alpha.json:generic-api-key:16
722650392739117747fb1729f46966282186d02c:scripts/deployment/globals_arbitrum_one_meme_alpha.json:generic-api-key:18
722650392739117747fb1729f46966282186d02c:scripts/deployment/globals_celo_mainnet.json:generic-api-key:1
7efd156c77f4b4e6d1b94e643e651f1f91612154:scripts/deployment/globals_celo_mainnet.json:generic-api-key:1
93830648ce39e12a4a3c4229363a02eb64f698c4:scripts/deployment/globals_arbitrum_one.json:generic-api-key:1
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,8 @@ See [here](docs/agents.md).
## Contract Development

See [here](docs/contracts.md).

## Acknowledgements
- [Rari-Capital](https://github.com/Rari-Capital/solmate).
- [Uniswap V3](https://github.com/Uniswap/v3-core).
- [Zelic reports](https://reports.zellic.io/publications/beefy-uniswapv3/sections/observation-cardinality-observation-cardinality).
231 changes: 231 additions & 0 deletions abis/0.8.28/BalancerPriceOracle.json

Large diffs are not rendered by default.

Loading
Loading