Skip to content

Commit

Permalink
Merge pull request #1730 from sphinx-labs/main
Browse files Browse the repository at this point in the history
Version Packages
  • Loading branch information
RPate97 committed Jun 11, 2024
2 parents 5b70f64 + 5fb24a8 commit 1a20968
Show file tree
Hide file tree
Showing 16 changed files with 106 additions and 102 deletions.
7 changes: 0 additions & 7 deletions .changeset/thick-walls-bow.md

This file was deleted.

24 changes: 5 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ Deployments with Sphinx are a three-step process:

* **No Lock-In**: You can execute deployments from your local machine without using the Sphinx DevOps Platform. These deployments are executed in the exact same manner as they would be executed with the DevOps Platform, including identical contract addresses. This includes networks that the DevOps Platform doesn't currently support.

## Request Access

Sphinx is currently invite-only. [Request access on our website](https://sphinx.dev).
## Self Hosting
Sphinx is designed to be used with the [Sphinx Platform](https://github.com/sphinx-labs/sphinx-platform) which you must host yourself. You can find information on running the Sphinx Platform locally and recommendations for hosting in the [Sphinx Platform documentation](https://github.com/sphinx-labs/sphinx-platform/blob/main/docs).

## Pricing

Pricing for the DevOps Platform is on the [website's landing page](https://sphinx.dev).

Sphinx does not charge for the [Deploy CLI Command](https://github.com/sphinx-labs/sphinx/blob/main/docs/cli-deploy.md), which executes the deployment from your local machine without using the DevOps Platform. However, since it doesn't use the DevOps Platform, you'll need native gas tokens for the deployment.
Sphinx is free and open source. You must host the Sphinx platform yourself to be able to use it.

## Demo

Expand Down Expand Up @@ -83,9 +80,8 @@ A demo of the DevOps Platform is on the [website's landing page](https://sphinx.

Please feel free to reach out to us in our [Discord](https://discord.gg/7Gc3DK33Np) to request a feature!

## Networks Supported by the DevOps Platform

> Note: You can use the [Deploy CLI Command](https://github.com/sphinx-labs/sphinx/blob/main/docs/cli-deploy.md) to deploy on networks that the DevOps Platform doesn't currently support.
## Networks Supported
The Sphinx core contracts are deployed on the following networks.

- Ethereum
- Optimism
Expand Down Expand Up @@ -142,23 +138,13 @@ Test networks:
- Mantle Sepolia
- Astar zKyoto

More networks are on the way! Please reach out to us in our [Discord](https://discord.gg/7Gc3DK33Np) if there are networks you'd like us to add.

## Contributors

[@rpate97](https://github.com/RPate97)\
[@sam-goldman](https://github.com/sam-goldman)\
[@smartcontracts](https://github.com/smartcontracts)\
[Wonderland](https://defi.sucks/)

## Contributing

Contributions to Sphinx are greatly appreciated! Please read our [contributing guide](https://github.com/sphinx-labs/sphinx/blob/main/CONTRIBUTING.md) to get started. Then, check out the list of [Good First Issues](https://github.com/sphinx-labs/sphinx/contribute). Let us know if you have any questions!

## Reach Out

If you have any questions or feature requests, send us a message in our [Discord!](https://discord.gg/7Gc3DK33Np)

## License

We use the Gnosis Safe contracts as a library. These contracts are licensed under [LGPL v3](https://github.com/safe-global/safe-contracts/blob/main/LICENSE). You can access them in [Gnosis Safe's repository](https://github.com/safe-global/safe-contracts).
Expand Down
7 changes: 6 additions & 1 deletion docs/cli-existing-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ In this guide, you'll propose the deployment on the command line and then approv

## 1. Prerequisites

* You must have an invite link to the DevOps platform because it's currently invite-only. [Request access on Sphinx's website.](https://sphinx.dev)
* You must have a running instance of the [Sphinx Platform](https://github.com/sphinx-labs/sphinx-platform/block/main/docs/local.md).
* You must have an existing Foundry project that includes a Forge script. If you don't, we recommend following the [Getting Started in a New Repository guide](https://github.com/sphinx-labs/sphinx/blob/main/docs/cli-quickstart.md) instead.
* You must have an RPC node provider API key. If you don't already have one, we recommend [Alchemy](https://www.alchemy.com/) or [Infura](https://www.infura.io/).
* You must have an account that exists on live networks. This account will own your Gnosis Safe.
Expand Down Expand Up @@ -183,6 +183,11 @@ You'll need to update the `projectName` field to match the Project Name you crea

## 10. Add environment variables

Add your Sphinx instance url to your environment file:
```
SPHINX_MANAGED_BASE_URL=<your_sphinx_instance_url>
```

Get your Sphinx API Key from the Sphinx UI and add it as an environment variable:
```
SPHINX_API_KEY=<your_api_key>
Expand Down
17 changes: 12 additions & 5 deletions docs/cli-quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ In this guide, you'll create a sample project, propose it on the command line, a
4. [Install dependencies](#4-install-dependencies)
5. [Create a new Sphinx project](#5-create-a-new-sphinx-project)
6. [Initialize Sphinx](#6-initialize-sphinx)
7. [Propose on testnets](#7-propose-on-testnets)
8. [Next steps](#8-next-steps)
7. [Add your Sphinx Platform instance url](#7-add-your-sphinx-platform-instance-url)
8. [Propose on testnets](#8-propose-on-testnets)
9. [Next steps](#9-next-steps)

## 1. Prerequisites

* You must have an invite link to the DevOps platform because it's currently invite-only. [Request access on Sphinx's website.](https://sphinx.dev)
* You must have a running instance of the [Sphinx Platform](https://github.com/sphinx-labs/sphinx-platform/block/main/docs/local.md).
* You must have a basic understanding of how to use Foundry and Forge scripts. Here are the relevant guides in the Foundry docs:
* [Getting Started with Foundry](https://book.getfoundry.sh/getting-started/first-steps)
* [Writing Deployment Scripts with Foundry](https://book.getfoundry.sh/tutorials/solidity-scripting)
Expand Down Expand Up @@ -100,7 +101,13 @@ After you run the command, you'll notice several new files:
- `.env`: A sample `.env` file that contains your credentials.
- `.gitignore`: A sample `.gitignore` file that contains files and directories generated by Sphinx, Foundry, and Node.

## 7. Propose on testnets
## 7. Add your Sphinx Platform instance url
Add your Sphinx instance URL to your environment file:
```
SPHINX_MANAGED_BASE_URL=<your_sphinx_instance_url>
```

## 8. Propose on testnets

Copy and paste one of the following commands to propose your deployment with the DevOps Platform.

Expand All @@ -123,7 +130,7 @@ Here are the steps that occur when you run this command:

When the proposal is finished, go to the [Sphinx UI](https://sphinx.dev) to approve the deployment. After you approve it, you can monitor the deployment's status in the UI while it's executed.

## 8. Next steps
## 9. Next steps

Congrats, you've finished your first deployment with Sphinx!

Expand Down
6 changes: 6 additions & 0 deletions packages/contracts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @sphinx-labs/contracts

## 0.23.0

### Minor Changes

- ee6eeed: Opensource platform

## 0.22.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/foundry/SphinxConstants.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity >=0.6.2 <0.9.0;
import { NetworkInfo, NetworkType } from "./SphinxPluginTypes.sol";

contract SphinxConstants {
string public constant sphinxLibraryVersion = 'v0.22.0';
string public constant sphinxLibraryVersion = 'v0.23.0';
address public constant compatibilityFallbackHandlerAddress = 0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4;
address public constant multiSendAddress = 0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761;
address public constant createCallAddress = 0x7cbB62EaA69F79e6873cD1ecB2392971036cFAa4;
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sphinx-labs/contracts",
"version": "0.22.0",
"version": "0.23.0",
"description": "Sphinx contracts",
"main": "dist/index",
"types": "dist/index",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const CONTRACTS_LIBRARY_VERSION = 'v0.22.0'
export const CONTRACTS_LIBRARY_VERSION = 'v0.23.0'
75 changes: 18 additions & 57 deletions packages/contracts/test/SphinxInitCode.sol

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# @sphinx-labs/core

## 0.26.0

### Minor Changes

- ee6eeed: Opensource platform

### Patch Changes

- Updated dependencies [ee6eeed]
- @sphinx-labs/contracts@0.23.0

## 0.25.2

### Patch Changes

- fbf95a5: Rollback internal hardhat sim change

## 0.25.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sphinx-labs/core",
"version": "0.25.1",
"version": "0.26.0",
"description": "Sphinx core library",
"main": "dist/index",
"types": "dist/index",
Expand Down Expand Up @@ -38,7 +38,7 @@
"@nomicfoundation/hardhat-verify": "^2.0.2",
"@openzeppelin/hardhat-upgrades": "^1.22.1",
"@openzeppelin/merkle-tree": "1.0.5",
"@sphinx-labs/contracts": "^0.22.0",
"@sphinx-labs/contracts": "^0.23.0",
"axios": "^1.4.0",
"chalk": "^4.1.2",
"core-js": "^3.27.1",
Expand Down
9 changes: 9 additions & 0 deletions packages/demo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @sphinx-labs/demo

## 0.13.1

### Patch Changes

- Updated dependencies [ee6eeed]
- @sphinx-labs/contracts@0.23.0
- @sphinx-labs/plugins@0.33.0
- @sphinx-labs/core@0.26.0

## 0.13.0

### Minor Changes
Expand Down
8 changes: 4 additions & 4 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@sphinx-labs/demo",
"version": "0.13.0",
"version": "0.13.1",
"description": "Sphinx demo",
"main": "dist/index",
"types": "dist/index",
Expand Down Expand Up @@ -42,9 +42,9 @@
"p-limit": "^3.1.0"
},
"dependencies": {
"@sphinx-labs/contracts": "^0.22.0",
"@sphinx-labs/core": "^0.25.0",
"@sphinx-labs/plugins": "^0.32.0",
"@sphinx-labs/contracts": "^0.23.0",
"@sphinx-labs/core": "^0.26.0",
"@sphinx-labs/plugins": "^0.33.0",
"@types/node": "^18.0.0",
"ds-test": "https://github.com/dapphub/ds-test.git#e282159d5170298eb2455a6c05280ab5a73a4ef0",
"ethers": "^6.7.0",
Expand Down
20 changes: 20 additions & 0 deletions packages/plugins/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# @sphinx-labs/plugins

## 0.33.0

### Minor Changes

- ee6eeed: Opensource platform

### Patch Changes

- Updated dependencies [ee6eeed]
- @sphinx-labs/contracts@0.23.0
- @sphinx-labs/core@0.26.0

## 0.32.2

### Patch Changes

- fbf95a5: Rollback internal hardhat sim change
- Updated dependencies [fbf95a5]
- @sphinx-labs/core@0.25.2

## 0.32.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sphinx-labs/plugins",
"version": "0.32.1",
"version": "0.33.0",
"description": "Sphinx plugins",
"main": "dist/index",
"types": "dist/index",
Expand Down Expand Up @@ -45,8 +45,8 @@
"@nomicfoundation/hardhat-ethers": "^3.0.5",
"@openzeppelin/contracts": "^4.8.1",
"@openzeppelin/hardhat-upgrades": "^1.22.1",
"@sphinx-labs/contracts": "^0.22.0",
"@sphinx-labs/core": "^0.25.1",
"@sphinx-labs/contracts": "^0.23.0",
"@sphinx-labs/core": "^0.26.0",
"@swc/core": "1.3.75",
"chalk": "^4.1.2",
"core-js": "^3.31.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/src/cli/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const SPHINX_PLUGINS_VERSION = 'v0.32.1'
export const SPHINX_PLUGINS_VERSION = 'v0.33.0'

0 comments on commit 1a20968

Please sign in to comment.