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

Staging: Develop -> Master #227

Merged
merged 57 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
db48066
Update example .env file
0xJem Jul 12, 2024
bd6da43
chore: linting
0xJem Jul 12, 2024
cfa84f2
Merge pull request #221 from Axis-Fi/linting
0xJem Jul 12, 2024
9bb4bed
Add forge-std 1.9.1 as a dependency using soldeer. Updated from 1.7.1…
0xJem Jul 12, 2024
73546ba
Remove unused prb-math dependency
0xJem Jul 12, 2024
a1b7d3f
Shift to solmate 6.7.0 from soldeer. Adds ERC6909 contract not includ…
0xJem Jul 12, 2024
27fc801
Remove solmate from installation script
0xJem Jul 12, 2024
243461c
Shift to using solady 0.0.124 package in soldeer (same version).
0xJem Jul 12, 2024
e3cf82c
Shift to openzeppelin 4.9.2 package in soldeer (includes the upgradea…
0xJem Jul 12, 2024
8d7a0b5
Remove openzeppelin from install script
0xJem Jul 12, 2024
332252d
Shift to uniswap-v2-core 1.0.1 package in soldeer (same version)
0xJem Jul 12, 2024
e74a7bb
Install soldeer dependencies in install script
0xJem Jul 12, 2024
bdff393
chore: linting
0xJem Jul 12, 2024
d80f2b2
Update salts
0xJem Jul 12, 2024
14a5d4a
Install uniswap-v3 core 1.0.1 (same version) from soldeer. Removed re…
0xJem Jul 15, 2024
8edc2e8
Update salts
0xJem Jul 15, 2024
a02557a
chore: linting
0xJem Jul 15, 2024
72e003a
Update salts
0xJem Jul 15, 2024
cde033c
Merge branch 'master' into soldeer
0xJem Jul 15, 2024
8cc3540
Update salts
0xJem Jul 15, 2024
baf4a2f
Simplify first-run scripts and CI build
0xJem Jul 15, 2024
4c024a4
Document use of soldeer
0xJem Jul 15, 2024
63d8635
Document minimum version of soldeer
0xJem Jul 15, 2024
610ee34
Pin solmate to git commit in order to include ERC6909.
0xJem Jul 15, 2024
7171cfc
Bring LinearVesting under the size limit
0xJem Jul 15, 2024
43c46cd
WIP publish script
0xJem Jul 15, 2024
05034c5
Finalise publish script
0xJem Jul 15, 2024
30732b7
Add changelog
0xJem Jul 15, 2024
c7c46a3
Remove redundant MockERC6909
0xJem Jul 15, 2024
948a293
Shift to soldeer-provided clones-with-immutable-args
0xJem Jul 16, 2024
e553691
Adjust version of clones-with-immutable-args to be the same commit as…
0xJem Jul 16, 2024
19ee0d7
Shift callbacks to axis-periphery. Remove git subtrees used by callba…
0xJem Jul 16, 2024
85e4075
Temporarily remove references to DTL callbacks
0xJem Jul 16, 2024
79eb8ca
Update test salts
0xJem Jul 16, 2024
21457c7
WIP: shift imports to be relative, in order to fix remappings for dow…
0xJem Jul 16, 2024
7629f6f
Remove remaining relative imports
0xJem Jul 16, 2024
020c8a9
Update salts
0xJem Jul 16, 2024
a25d5bc
Remove deployment sequences for callbacks
0xJem Jul 16, 2024
c91541f
Remove redundant dependencies
0xJem Jul 16, 2024
dbde451
Update docs. Remove expectation of soldeer CLI.
0xJem Jul 16, 2024
eedb7ac
Add dependencies/ to solhint ignore file
0xJem Jul 16, 2024
84b8748
Clean up solhint ignore
0xJem Jul 16, 2024
cf614f3
chore: linting
0xJem Jul 16, 2024
79d44df
chore: linting
0xJem Jul 16, 2024
7ce898d
Remove addresses shifted into axis-periphery
0xJem Jul 16, 2024
1985859
Port changes to WithEnvironment from Axis-Fi/axis-periphery@dbf92710d…
0xJem Jul 16, 2024
dbb1947
chore: linting
0xJem Jul 16, 2024
623ca2e
Remove redundant docs
0xJem Jul 16, 2024
d07b331
Experiment: revert implicit imports (#223)
0xJem Jul 16, 2024
a7eee2a
Case-sensitive filename
0xJem Jul 16, 2024
a44a9b2
Add documentation on updating dependencies
0xJem Jul 17, 2024
9d7ebd5
Merge branch 'master' into develop
Oighty Jul 17, 2024
46102ff
chore: change license in package.json to match
Oighty Jul 17, 2024
e19ca19
Merge pull request #222 from Axis-Fi/soldeer
Oighty Jul 17, 2024
b13c44d
chore: move BaseCallback to bases folder
Oighty Jul 17, 2024
f02fe38
Merge branch 'develop' into periphery-migration
Oighty Jul 17, 2024
4e00b41
Merge pull request #225 from Axis-Fi/periphery-migration
Oighty Jul 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
Prev Previous commit
Next Next commit
Update docs. Remove expectation of soldeer CLI.
  • Loading branch information
0xJem committed Jul 16, 2024
commit dbde451a0975282a29a62a4d4be21916f87b197c
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,8 @@ Many of the contracts (e.g. callbacks) require a specific address prefix or have

- The code of a callback contract has been changed
- This requires re-generating the salt for the contract. See the [test_salts.sh](/script/salts/test/test_salts.sh) script.
- There has been a change to the dependencies under `/lib`. The dependencies affect the build output, so any changes will affect the bytecode generated by the Solidity compiler.
- If the submodule change was inadvertent, this can be fixed by running `pnpm run full-install` to reset the changes.
- In some cases, such as the `g-uni-v1-core` dependency, installing npm packages will result in the remappings being changed. It is best to remove the dependency's respective dependencies in order to fix this.
- There has been a change to the dependencies under `/lib` or `/dependencies`. The dependencies affect the build output, so any changes will affect the bytecode generated by the Solidity compiler.
- If the change was inadvertent, this can be fixed by running `pnpm install` to reset the changes.
- If the change to dependencies and invalidation of salts is expected, then new salts must be generated. In some cases (such as Uniswap V2 and V3 factories), the new addresses must be recorded in the `Constants.sol` file.

### Format
Expand Down
9 changes: 1 addition & 8 deletions script/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,8 @@ if [ -z "$1" ]; then
exit 1
fi

# Check that soldeer is present
if ! command -v soldeer &> /dev/null
then
echo "soldeer could not be found. Please install it by running 'cargo install soldeer'."
exit
fi

# Update the version number in the package.json file
npm version $1

# Push the new version to soldeer
soldeer push axis-core~v$1
forge soldeer push axis-core~v$1