From 37d38bbbb5ea1eca162f5466d48baf30a5064a12 Mon Sep 17 00:00:00 2001 From: Tom Hirst Date: Thu, 22 Aug 2024 15:11:05 +0100 Subject: [PATCH 1/4] change default authorizedMinter address from EOA to router --- scripts/common/constants.ts | 2 +- scripts/deploy.ts | 4 ++-- scripts/deploy1155.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/common/constants.ts b/scripts/common/constants.ts index 9a8c190..22f9fb4 100644 --- a/scripts/common/constants.ts +++ b/scripts/common/constants.ts @@ -22,4 +22,4 @@ export const ERC721CV2_EMPTY_LIST = 4; // Mainnet, Polygon, Base export const ERC721CMRoyaltiesCloneFactoryContract = '0x7cEEd7215D71393d56966dA48C5727851326e101'; -export const RESERVOIR_RELAYER_EOA = '0xf70da97812CB96acDF810712Aa562db8dfA3dbEF'; \ No newline at end of file +export const RESERVOIR_RELAYER_ROUTER = '0x2f5d6b76bf8086797e1bd0b28bb4dd5583476cc9'; \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index b37f840..14d0244 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -6,7 +6,7 @@ import { confirm } from '@inquirer/prompts'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; -import { ContractDetails, RESERVOIR_RELAYER_EOA } from './common/constants'; +import { ContractDetails, RESERVOIR_RELAYER_ROUTER } from './common/constants'; import { checkCodeVersion, estimateGas } from './utils/helper'; import { Overrides } from 'ethers'; @@ -140,6 +140,6 @@ export const deploy = async ( ); const erc721cm = ERC721CM.attach(contract.address); - await erc721cm.addAuthorizedMinter(RESERVOIR_RELAYER_EOA); + await erc721cm.addAuthorizedMinter(RESERVOIR_RELAYER_ROUTER); console.log('[ERC721CM] Added Reservoir Relayer as authorized minter'); }; diff --git a/scripts/deploy1155.ts b/scripts/deploy1155.ts index 52e811a..061a515 100644 --- a/scripts/deploy1155.ts +++ b/scripts/deploy1155.ts @@ -1,6 +1,6 @@ import { confirm } from '@inquirer/prompts'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; -import { ContractDetails, RESERVOIR_RELAYER_EOA } from './common/constants'; +import { ContractDetails, RESERVOIR_RELAYER_ROUTER } from './common/constants'; import { checkCodeVersion, estimateGas } from './utils/helper'; import { Overrides } from 'ethers'; @@ -103,6 +103,6 @@ export const deploy1155 = async ( ); // Add reservoir relay as authorized minter by default - await contract.addAuthorizedMinter(RESERVOIR_RELAYER_EOA); + await contract.addAuthorizedMinter(RESERVOIR_RELAYER_ROUTER); console.log('[ERC721CM] Added Reservoir Relayer as authorized minter'); }; From 17b6875039fad14bdedaf4d69dd543f66a64dbd8 Mon Sep 17 00:00:00 2001 From: Tom Hirst Date: Thu, 22 Aug 2024 15:14:38 +0100 Subject: [PATCH 2/4] checksum address --- scripts/common/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common/constants.ts b/scripts/common/constants.ts index 22f9fb4..fbe33b9 100644 --- a/scripts/common/constants.ts +++ b/scripts/common/constants.ts @@ -22,4 +22,4 @@ export const ERC721CV2_EMPTY_LIST = 4; // Mainnet, Polygon, Base export const ERC721CMRoyaltiesCloneFactoryContract = '0x7cEEd7215D71393d56966dA48C5727851326e101'; -export const RESERVOIR_RELAYER_ROUTER = '0x2f5d6b76bf8086797e1bd0b28bb4dd5583476cc9'; \ No newline at end of file +export const RESERVOIR_RELAYER_ROUTER = '0x2f5D6B76bF8086797e1BD0b28bB4DD5583476cC9'; \ No newline at end of file From d6baa920136dcfa49949d46da8a19ccabba9da3b Mon Sep 17 00:00:00 2001 From: Tom Hirst Date: Fri, 23 Aug 2024 18:50:43 +0100 Subject: [PATCH 3/4] update to new relay router address --- scripts/common/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common/constants.ts b/scripts/common/constants.ts index fbe33b9..e6e945a 100644 --- a/scripts/common/constants.ts +++ b/scripts/common/constants.ts @@ -22,4 +22,4 @@ export const ERC721CV2_EMPTY_LIST = 4; // Mainnet, Polygon, Base export const ERC721CMRoyaltiesCloneFactoryContract = '0x7cEEd7215D71393d56966dA48C5727851326e101'; -export const RESERVOIR_RELAYER_ROUTER = '0x2f5D6B76bF8086797e1BD0b28bB4DD5583476cC9'; \ No newline at end of file +export const RESERVOIR_RELAYER_ROUTER = '0xA1BEa5fe917450041748Dbbbe7E9AC57A4bBEBaB'; \ No newline at end of file From adf239debc9a1f4aadd124a269706bbbf253ac5e Mon Sep 17 00:00:00 2001 From: Tom Hirst Date: Tue, 27 Aug 2024 19:32:29 +0100 Subject: [PATCH 4/4] use multicaller address --- scripts/common/constants.ts | 2 +- scripts/deploy.ts | 4 ++-- scripts/deploy1155.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/common/constants.ts b/scripts/common/constants.ts index e6e945a..b80c69e 100644 --- a/scripts/common/constants.ts +++ b/scripts/common/constants.ts @@ -22,4 +22,4 @@ export const ERC721CV2_EMPTY_LIST = 4; // Mainnet, Polygon, Base export const ERC721CMRoyaltiesCloneFactoryContract = '0x7cEEd7215D71393d56966dA48C5727851326e101'; -export const RESERVOIR_RELAYER_ROUTER = '0xA1BEa5fe917450041748Dbbbe7E9AC57A4bBEBaB'; \ No newline at end of file +export const RESERVOIR_RELAYER_MUTLICALLER = '0xb90ed4c123843cbFD66b11411Ee7694eF37E6E72'; \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 14d0244..9c783ab 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -6,7 +6,7 @@ import { confirm } from '@inquirer/prompts'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; -import { ContractDetails, RESERVOIR_RELAYER_ROUTER } from './common/constants'; +import { ContractDetails, RESERVOIR_RELAYER_MUTLICALLER } from './common/constants'; import { checkCodeVersion, estimateGas } from './utils/helper'; import { Overrides } from 'ethers'; @@ -140,6 +140,6 @@ export const deploy = async ( ); const erc721cm = ERC721CM.attach(contract.address); - await erc721cm.addAuthorizedMinter(RESERVOIR_RELAYER_ROUTER); + await erc721cm.addAuthorizedMinter(RESERVOIR_RELAYER_MUTLICALLER); console.log('[ERC721CM] Added Reservoir Relayer as authorized minter'); }; diff --git a/scripts/deploy1155.ts b/scripts/deploy1155.ts index 061a515..1b21caa 100644 --- a/scripts/deploy1155.ts +++ b/scripts/deploy1155.ts @@ -1,6 +1,6 @@ import { confirm } from '@inquirer/prompts'; import { HardhatRuntimeEnvironment } from 'hardhat/types'; -import { ContractDetails, RESERVOIR_RELAYER_ROUTER } from './common/constants'; +import { ContractDetails, RESERVOIR_RELAYER_MUTLICALLER } from './common/constants'; import { checkCodeVersion, estimateGas } from './utils/helper'; import { Overrides } from 'ethers'; @@ -103,6 +103,6 @@ export const deploy1155 = async ( ); // Add reservoir relay as authorized minter by default - await contract.addAuthorizedMinter(RESERVOIR_RELAYER_ROUTER); + await contract.addAuthorizedMinter(RESERVOIR_RELAYER_MUTLICALLER); console.log('[ERC721CM] Added Reservoir Relayer as authorized minter'); };