Skip to content

Commit

Permalink
feat(v1.5.0-beta): updates to v1.5.0-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexangelj committed Oct 23, 2023
1 parent 00a770c commit b7c9bba
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ Read the local [docs](./docs/src/), hosted docs [docs.primitive.xyz](https://doc
| -------------------- | -------------------------------------------- |
| Portfolio 1.3.0-beta | `0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1` |
| Portfolio 1.4.0-beta | `todo` |
| Portfolio 1.5.0-beta | `n/a` |

### Deployments by Chain

| Network | Portfolio 1.3.0-beta | Portfolio v1.4.0-beta |
| -------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------- |
| Ethereum | [0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1](https://etherscan.io/address/0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1 ) | todo |
| Base | n/a | todo |
| Sepolia | [0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1](https://sepolia.etherscan.io/address/0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1) | todo |
| Network | Portfolio 1.3.0-beta | Portfolio v1.4.0-beta | Portfolio v1.5.0-beta |
| -------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------- | --------------------- |
| Ethereum | [0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1](https://etherscan.io/address/0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1 ) | n/a |n/a |
| Base | n/a | n/a |n/a |
| Sepolia | [0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1](https://sepolia.etherscan.io/address/0x82360b9a2076a09ea8abe2b3e11aed89de3a02d1) | n/a |n/a |

# Security

Expand All @@ -52,7 +53,7 @@ Read the local [docs](./docs/src/), hosted docs [docs.primitive.xyz](https://doc
| [Trail of Bits](https://github.com/primitivefinance/security/blob/main/audits/portfolio/trailofbits.pdf) | 2023-01-31 | 8-weeks | Completed | n/a |
| [Spearbit #1](https://github.com/primitivefinance/security/blob/main/audits/portfolio/spearbit.pdf) | 2023-03-31 | 5-weeks | Completed | [tag/v1.1.0-beta](https://github.com/primitivefinance/portfolio/releases/tag/v1.1.0-beta) |
| [Spearbit #1 Extension](https://github.com/primitivefinance/security/blob/main/audits/portfolio/spearbit.pdf) | 2023-05-12 | 2-weeks | Competed | [36e9efa28332fa03f6d5910edda2fec2f5937190](https://github.com/primitivefinance/portfolio/commit/36e9efa28332fa03f6d5910edda2fec2f5937190 ) |
| Spearbit #2 | 2023-07-78 | 2-weeks | Completed | [tag/v1.4.0-beta-spearbit-2023-08-complete](https://github.com/primitivefinance/portfolio/releases/tag/v1.4.0-beta-spearbit-2023-08-complete) |
| Spearbit #2 | 2023-07-78 | 2-weeks | Completed | [tag/v1.5.0-beta-spearbit-2023-08-complete](https://github.com/primitivefinance/portfolio/releases/tag/v1.5.0-beta-spearbit-2023-08-complete) |

## Install

Expand Down
4 changes: 2 additions & 2 deletions contracts/Portfolio.sol
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ contract Portfolio is ERC1155, IPortfolio {
mstore(0x00, 0x20)

// We load the length of our string (11 bytes, 0x0b in hex) and its
// actual hex value (0x76312e342e302d62657461) using the offset 0x2b.
// actual hex value (0x76312e352e302d62657461) using the offset 0x2b.
// Using this particular offset value will right pad the length at
// the end of the slot and left pad the string at the beginning of
// the next slot, assuring the right ABI format to return a string.
mstore(0x2b, 0x0b76312e342e302d62657461) // "v1.4.0-beta"
mstore(0x2b, 0x0b76312e352e302d62657461) // "v1.5.0-beta"

// Return all the 96 bytes (0x60) of data that was loaded into
// the memory.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@primitivexyz/portfolio",
"license": "AGPL-3.0-only",
"version": "v1.4.0-beta",
"version": "v1.5.0-beta",
"description": "Portfolio is an automated market making protocol for implementing custom liquidity distribution strategies at the lowest cost possible. ",
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion test/Setup.sol
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ contract Setup is ISetup, Test, ERC1155TokenReceiver {
poolId: 0
});

assertEq(subject().VERSION(), "v1.4.0-beta", "version-not-equal");
assertEq(subject().VERSION(), "v1.5.0-beta", "version-not-equal");
}

// ============= Edit Test Environment ============= //
Expand Down

0 comments on commit b7c9bba

Please sign in to comment.