Develop

.gitignore

@@ -291,3 +291,11 @@ projects/gas-usage-tests/build/contracts/RoyaltiesV2.json
 projects/gas-usage-tests/build/contracts/SafeMathUpgradeable.json
 projects/gas-usage-tests/build/contracts/TransferExecutor.json
 projects/gas-usage-tests/build/contracts/TransferProxy.json
+projects/exchange-wrapper/build/contracts/ERC165Upgradeable.json
+projects/exchange-wrapper/build/contracts/ERC721HolderUpgradeable.json
+projects/exchange-wrapper/build/contracts/ERC1155HolderUpgradeable.json
+projects/exchange-wrapper/build/contracts/ERC1155ReceiverUpgradeable.json
+projects/exchange-wrapper/build/contracts/IERC721ReceiverUpgradeable.json
+projects/exchange-wrapper/build/contracts/IERC1155ReceiverUpgradeable.json
+projects/exchange-wrapper/build/contracts/PausableUpgradeable.json
+projects/exchange-wrapper/build/contracts/RaribleExchangeWrapperUpgradeable.json

.nvmrc

@@ -1 +1 @@
-v18.13.0
+v18.17.0

Dockerfile

@@ -1,14 +1,33 @@
-FROM node:18.19.0 as base
-WORKDIR /protocol
-RUN npm install -g truffle@5.4.17
+ARG BASE_IMAGE_VERSION=20.18.3-bullseye
+FROM node:${BASE_IMAGE_VERSION} AS base
+
+FROM base AS base-dev
+
+WORKDIR /app
+
+RUN apt-get update -y \
+ && apt-get install -y --no-install-recommends \
+      ca-certificates curl gnupg jq git \
+ && npm install -g truffle@5.11.5 \
+ && rm -rf /var/{lib/apt,lib/dpkg/info,cache,log}/*
+
+# ---- Foundry ----
+RUN curl -L https://foundry.paradigm.xyz | bash \
+ && /root/.foundry/bin/foundryup \
+ && install -Dm755 /root/.foundry/bin/* /usr/local/bin \
+ && rm -rf /root/.foundry
+
+ENV PATH="/usr/local/bin:${PATH}"
+
 COPY . .
 RUN yarn install
 RUN yarn build
+RUN yarn test
 
-FROM base as deploy
-WORKDIR /protocol/deploy
-ENTRYPOINT ["truffle", "test", "--compile-all"]
+# FROM base as deploy
+# WORKDIR /protocol/deploy
+# ENTRYPOINT ["truffle", "test", "--compile-all"]
 
-FROM base as exchange-v2
-WORKDIR /protocol/exchange-v2
-ENTRYPOINT ["truffle", "test", "--compile-all"]
+# FROM base as exchange-v2
+# WORKDIR /protocol/exchange-v2
+# ENTRYPOINT ["truffle", "test", "--compile-all"]

lerna.json

@@ -2,7 +2,7 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "packages": ["projects/**"],
   "npmClient": "yarn",
-  "version": "0.8.4",
+  "version": "0.8.13",
   "command": {
     "version": {
       "allowBranch": ["master", "develop", "feature/*"]

package.json

@@ -9,7 +9,7 @@
         "bootstrap": "lerna bootstrap --no-ci && lerna link",
         "bootstrap:ci": "lerna bootstrap --ci && lerna link",
         "build": "sh scripts/build.sh",
-        "test": "sh scripts/test.sh",
+        "test": "lerna exec -- yarn test",
         "release": "git reset --hard && lerna publish from-package",
         "build:deploy": "yarn workspace @rarible/deploy run build",
         "build:exchange-v2": "yarn workspace @rarible/exchange-v2 run build",
@@ -45,5 +45,6 @@
         "tslib": "^2.5.0",
         "typechain": "^8.2.0",
         "typescript": "^5.0.4"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

projects/custom-matchers/CHANGELOG.md

@@ -3,7 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.8.4](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.4) (2025-04-21)
+## [0.8.13](https://github.com/rariblecom/protocol-contracts/compare/v0.8.12...v0.8.13) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.12](https://github.com/rariblecom/protocol-contracts/compare/v0.8.11...v0.8.12) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.11](https://github.com/rariblecom/protocol-contracts/compare/v0.8.10...v0.8.11) (2025-04-30)
+
+### Features
+
+- fix test and build ([78ae40b](https://github.com/rariblecom/protocol-contracts/commit/78ae40b4fdda18da610b022621a92f6944bdd8ba))
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.10](https://github.com/rariblecom/protocol-contracts/compare/v0.8.9...v0.8.10) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.8](https://github.com/rariblecom/protocol-contracts/compare/v0.8.7...v0.8.8) (2025-04-29)
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.6](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.6) (2024-04-27)
+
+**Note:** Version bump only for package @rarible/custom-matchers
+
+## [0.8.5](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.5) (2024-04-27)
 
 **Note:** Version bump only for package @rarible/custom-matchers
 

projects/custom-matchers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rarible/custom-matchers",
-  "version": "0.8.4",
+  "version": "0.8.13",
   "description": "Custom matchers for different asset classes",
   "files": [
     "contracts",
@@ -22,8 +22,8 @@
     "url": "https://github.com/rariblecom/protocol-contracts/issues"
   },
   "dependencies": {
-    "@rarible/exchange-interfaces": "^0.8.4",
-    "@rarible/lazy-mint": "^0.8.4",
+    "@rarible/exchange-interfaces": "^0.8.13",
+    "@rarible/lazy-mint": "^0.8.13",
     "ethers": "5.7.2",
     "truffle-plugin-verify": "^0.6.5"
   },
@@ -38,6 +38,7 @@
   },
   "gitHead": "c149f3e740650a91e0764245230dbddc8f8f423e",
   "scripts": {
-    "build": "truffle compile --all && typechain --target ethers-v5 'build/contracts/*.json' && tsc -skipLibCheck"
+    "build": "truffle compile --all && typechain --target ethers-v5 'build/contracts/*.json' && tsc -skipLibCheck",
+    "test": "pwd"
   }
 }

projects/deploy-proxy/CHANGELOG.md

@@ -3,6 +3,43 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.13](https://github.com/rarible/protocol-contracts/compare/v0.8.12...v0.8.13) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-proxy
+
+## [0.8.12](https://github.com/rarible/protocol-contracts/compare/v0.8.11...v0.8.12) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-proxy
+
+## [0.8.11](https://github.com/rarible/protocol-contracts/compare/v0.8.10...v0.8.11) (2025-04-30)
+
+### Features
+
+- fix test and build ([78ae40b](https://github.com/rarible/protocol-contracts/commit/78ae40b4fdda18da610b022621a92f6944bdd8ba))
+
+**Note:** Version bump only for package @rarible/deploy-proxy
+
+## [0.8.10](https://github.com/rarible/protocol-contracts/compare/v0.8.9...v0.8.10) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-proxy
+
+## [0.8.9](https://github.com/rarible/protocol-contracts/compare/v0.8.8...v0.8.9) (2025-04-30)
+
+### Features
+
+- fix build ([3857dfc](https://github.com/rarible/protocol-contracts/commit/3857dfcf6ab80beb519ae3d763a27196db1e3fea))
+- fix tests ([8da7eac](https://github.com/rarible/protocol-contracts/commit/8da7eacecd799cc81d6f42daaf576cdc9f25a528))
+- removed generated files ([1ef19d3](https://github.com/rarible/protocol-contracts/commit/1ef19d3ca6a74d6d7de97a52f7ed3fd9d5716a1c))
+
+## [0.8.8](https://github.com/rarible/protocol-contracts/compare/v0.8.7...v0.8.8) (2025-04-29)
+
+### Features
+
+- refactoring ([#283](https://github.com/rarible/protocol-contracts/issues/283)) ([014b6a3](https://github.com/rarible/protocol-contracts/commit/014b6a3ea4331c7334a0b5299614eb56fc5d58f3))
+- sanity check script for after new chain deployment ([#329](https://github.com/rarible/protocol-contracts/issues/329)) ([f046cc5](https://github.com/rarible/protocol-contracts/commit/f046cc564fa613894284c50b71eba44ed06e4483))
+
+**Note:** Version bump only for package @rarible/deploy-proxy
+
 ## [0.8.7](https://github.com/rarible/protocol-contracts/compare/v0.8.6...v0.8.7) (2024-04-27)
 
 ### Bug Fixes

projects/deploy-proxy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rarible/deploy-proxy",
-  "version": "0.8.4",
+  "version": "0.8.13",
   "main": "truffle.js",
   "directories": {
     "test": "test"
@@ -28,18 +28,18 @@
     "@matterlabs/hardhat-zksync-chai-matchers": "1.2.1",
     "@matterlabs/hardhat-zksync-deploy": "^0.6.3",
     "@matterlabs/hardhat-zksync-ethers": "^0.0.1-beta.2",
-    "@matterlabs/hardhat-zksync-solc": "^0.3.15",
+    "@matterlabs/hardhat-zksync-solc": "^1.3.0",
     "@matterlabs/hardhat-zksync-toolbox": "^0.2.0",
     "@matterlabs/hardhat-zksync-upgradable": "^0.2.0",
     "@matterlabs/hardhat-zksync-verify": "0.2.1",
     "@openzeppelin/contracts": "3.4.0",
     "@openzeppelin/contracts-upgradeable": "3.4.0",
     "@openzeppelin/hardhat-upgrades": "^1.22.1",
     "@openzeppelin/upgrades-core": "~1.31.1",
+    "@rarible/external-contracts": "3.11.6",
     "eth-sig-util": "^3.0.1",
     "truffle-plugin-verify": "^0.6.5",
-    "zksync-ethers": "^5.0.0",
-    "@rarible/external-contracts": "3.11.6"
+    "zksync-ethers": "^5.0.0"
   },
   "devDependencies": {
     "@daonomic/tests-common": "0.2.2",
@@ -56,6 +56,7 @@
     "@openzeppelin/contracts-upgradeable": "^3.4.0",
     "@openzeppelin/hardhat-upgrades": "^1.22.1",
     "@openzeppelin/truffle-upgrades": "^1.8.1",
+    "@rarible/deploy-utils": "^0.8.13",
     "@tenderly/hardhat-tenderly": "^1.6.1",
     "@trezor/connect": "^9.1.4",
     "@trezor/connect-plugin-ethereum": "^9.0.2",
@@ -84,8 +85,7 @@
     "typechain": "^8.2.0",
     "typescript": "^5.0.4",
     "web3": "^1.8.2",
-    "zksync-web3": "^0.17.1",
-    "@rarible/deploy-utils": "^0.8.4"
+    "zksync-web3": "^0.17.1"
   },
   "publishConfig": {
     "access": "public"

projects/deploy-proxy/zk.hardhat.config.ts

@@ -68,7 +68,7 @@ function createNetwork(name: string): HttpNetworkUserConfig {
 
 const config: HardhatUserConfig = {
   zksolc: {
-    version: "1.3.22",
+    version: "1.5.12",
     settings: {
         isSystem: false, // optional.  Enables Yul instructions available only for zkSync system contracts and libraries
         forceEvmla: false, // optional. Falls back to EVM legacy assembly if there is a bug with Yul

projects/deploy-utils/CHANGELOG.md

@@ -3,6 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.8.13](https://github.com/rarible/protocol-contracts/compare/v0.8.12...v0.8.13) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-utils
+
+## [0.8.12](https://github.com/rarible/protocol-contracts/compare/v0.8.11...v0.8.12) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-utils
+
+## [0.8.11](https://github.com/rarible/protocol-contracts/compare/v0.8.10...v0.8.11) (2025-04-30)
+
+### Features
+
+- fix test and build ([78ae40b](https://github.com/rarible/protocol-contracts/commit/78ae40b4fdda18da610b022621a92f6944bdd8ba))
+
+**Note:** Version bump only for package @rarible/deploy-utils
+
+## [0.8.10](https://github.com/rarible/protocol-contracts/compare/v0.8.9...v0.8.10) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy-utils
+
+## [0.8.8](https://github.com/rarible/protocol-contracts/compare/v0.8.7...v0.8.8) (2025-04-29)
+
+### Features
+
+- add new config ([#289](https://github.com/rarible/protocol-contracts/issues/289)) ([266cf8c](https://github.com/rarible/protocol-contracts/commit/266cf8cc237d009dbd98850120f54ac10ef66a8e))
+- refactoring ([#283](https://github.com/rarible/protocol-contracts/issues/283)) ([014b6a3](https://github.com/rarible/protocol-contracts/commit/014b6a3ea4331c7334a0b5299614eb56fc5d58f3))
+
+**Note:** Version bump only for package @rarible/deploy-utils
+
 ## [0.8.4](https://github.com/rarible/protocol-contracts/compare/v0.8.1...v0.8.4) (2025-04-21)
 
 ### Bug Fixes

projects/deploy-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rarible/deploy-utils",
-  "version": "0.8.4",
+  "version": "0.8.13",
   "description": "Utils package",
   "keywords": [
     "utils"
@@ -21,7 +21,8 @@
     "url": "git+https://github.com/rarible/protocol-contracts.git"
   },
   "scripts": {
-    "build": "tsc -skipLibCheck"
+    "build": "tsc -skipLibCheck",
+    "test": "pwd"
   },
   "bugs": {
     "url": "https://github.com/rarible/protocol-contracts/issues"

projects/deploy/CHANGELOG.md

@@ -3,13 +3,57 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.8.4](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.4) (2025-04-21)
+## [0.8.13](https://github.com/rariblecom/protocol-contracts/compare/v0.8.12...v0.8.13) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.12](https://github.com/rariblecom/protocol-contracts/compare/v0.8.11...v0.8.12) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.11](https://github.com/rariblecom/protocol-contracts/compare/v0.8.10...v0.8.11) (2025-04-30)
+
+### Features
+
+- fix test and build ([78ae40b](https://github.com/rariblecom/protocol-contracts/commit/78ae40b4fdda18da610b022621a92f6944bdd8ba))
+
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.10](https://github.com/rariblecom/protocol-contracts/compare/v0.8.9...v0.8.10) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.9](https://github.com/rariblecom/protocol-contracts/compare/v0.8.8...v0.8.9) (2025-04-30)
+
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.8](https://github.com/rariblecom/protocol-contracts/compare/v0.8.7...v0.8.8) (2025-04-29)
 
 ### Bug Fixes
 
 - remove auction: not needed at the moment ([ecbc515](https://github.com/rariblecom/protocol-contracts/commit/ecbc515b058acadeace296ede9793afe5831bfcf))
 - removed uneeded code ([b5110cc](https://github.com/rariblecom/protocol-contracts/commit/b5110cc7a0b712ce16339756e6e3f190e4a8d443))
 
+**Note:** Version bump only for package @rarible/deploy
+
+## [0.8.6](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.6) (2024-04-27)
+
+### Bug Fixes
+
+- build ([5a04947](https://github.com/rariblecom/protocol-contracts/commit/5a049478b8acde4a8681b09d2f9aa5c54bd9fa58))
+
+### Features
+
+- add build deps ([822c123](https://github.com/rariblecom/protocol-contracts/commit/822c123199ac04598b6f8ab995ee8e8a66828015))
+- PT-4662 get rid of nothing to fill tests ([4059dcb](https://github.com/rariblecom/protocol-contracts/commit/4059dcb20c100e159643e40929392b05f90f7038))
+- PT-5072 add seaport 1.6 to exchange wrapper, deploy wrapper to sepolia ([c6f10f1](https://github.com/rariblecom/protocol-contracts/commit/c6f10f151740dd76da0e997b8bf499f03cba00a9))
+
+## [0.8.5](https://github.com/rariblecom/protocol-contracts/compare/v0.8.1...v0.8.5) (2024-04-27)
+
+### Bug Fixes
+
+- add missing import ([ec5a4ea](https://github.com/rariblecom/protocol-contracts/commit/ec5a4ea5a59c98a65aad20a2b382d8eb8ec50771))
+
 ### Features
 
 - add build deps ([822c123](https://github.com/rariblecom/protocol-contracts/commit/822c123199ac04598b6f8ab995ee8e8a66828015))

projects/deploy/migrations/10_initial_exchange_wrapper.js

@@ -70,6 +70,7 @@ const def = {
     zeroAddress, // looksRareV2
     zeroAddress, // blur
     "0x00000000000000ADc04C56Bf30aC9d3c0aAF14dC", // seaport_1_5
+    zeroAddress, // seaport_1_6 @dev ensure a working seaport_1_6 is not needed for proper truffle tests functionality.
   ],
 
   weth: zeroAddress,
@@ -168,7 +169,9 @@ function getWrapperSettings(network) {
   }
 }
 
-module.exports = async function (deployer, network) {
+module.exports = async function (deployer, network, accounts) {
+  const deployerAddress = accounts[0];
+
   const { deploy_meta, deploy_non_meta } = getSettings(network);
 
   let exchangeV2;
@@ -195,9 +198,9 @@ module.exports = async function (deployer, network) {
   settings.transferProxies.push(erc20TransferProxy.address)
 
   if (network === "polygon_mainnet") {
-    await deployer.deploy(RaribleExchangeWrapper, settings.marketplaces, settings.weth, settings.transferProxies, { gas: 4500000 * getGasMultiplier(network), nonce: 141 });
+    await deployer.deploy(RaribleExchangeWrapper, settings.marketplaces, settings.weth, settings.transferProxies, deployerAddress, { gas: 4500000 * getGasMultiplier(network), nonce: 141 });
   } else {
-    await deployer.deploy(RaribleExchangeWrapper, settings.marketplaces, settings.weth, settings.transferProxies, { gas: 4500000 * getGasMultiplier(network) });
+    await deployer.deploy(RaribleExchangeWrapper, settings.marketplaces, settings.weth, settings.transferProxies, deployerAddress, { gas: 4500000 * getGasMultiplier(network) });
   }