Skip to content

Commit c6b92af

Browse files
wojciech-turekwojciech-turek
committed
Merge branch 'master' of github.com-personal:thesandboxgame/sandbox-smart-contracts into passes-audit-h-03
2 parents c6cf946 + 79433cb commit c6b92af

File tree

71 files changed

+22885
-1195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+22885
-1195
lines changed

‎packages/deploy/.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ generated-markups
1515
# editors
1616
.idea
1717

18-
deployments/localhost
18+
deployments/localhost
19+
20+
# Land Sale secrets
21+
secret

‎packages/deploy/deploy/000_core/001_deploy_polygon_sand.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
88

99
const {deployer, sandAdmin, sandExecutionAdmin} = await getNamedAccounts();
1010

11-
const TRUSTED_FORWARDER_V2 = await deployments.get('TRUSTED_FORWARDER_V2');
11+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1212
const CHILD_CHAIN_MANAGER = await deployments.get('CHILD_CHAIN_MANAGER');
1313

1414
await deploy('PolygonSand', {
@@ -17,7 +17,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1717
'@sandbox-smart-contracts/core/src/solc_0.8/polygon/child/sand/PolygonSand.sol:PolygonSand',
1818
args: [
1919
CHILD_CHAIN_MANAGER.address,
20-
TRUSTED_FORWARDER_V2?.address,
20+
SandboxForwarder?.address,
2121
sandAdmin,
2222
sandExecutionAdmin,
2323
],
@@ -33,4 +33,4 @@ func.tags = [
3333
DEPLOY_TAGS.L2_PROD,
3434
DEPLOY_TAGS.L2_TEST,
3535
];
36-
func.dependencies = ['CHILD_CHAIN_MANAGER', 'TRUSTED_FORWARDER_V2'];
36+
func.dependencies = ['CHILD_CHAIN_MANAGER', 'SandboxForwarder'];

‎packages/deploy/deploy/1000_landsale/1000_deploy_estate_sale.ts

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ const sales: SaleDeployment[] = [
4040
{name: 'LandPreSale_35', skip: async () => true},
4141
{name: 'LandPreSale_36', skip: async () => true},
4242
{name: 'LandPreSale_37', skip: async () => true},
43+
{name: 'LandPreSale_38', skip: async () => true},
44+
{name: 'LandPreSale_39', skip: async () => false},
4345
];
4446

4547
const func: DeployFunction = async function (hre) {

‎packages/deploy/deploy/100_claim/100_multi_claim.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const func: DeployFunction = async function (
77
): Promise<void> {
88
const {deployments, getNamedAccounts} = hre;
99
const {deployer, upgradeAdmin, sandAdmin} = await getNamedAccounts();
10-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
10+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1111
await deployments.deploy('SignedMultiGiveaway', {
1212
from: deployer,
1313
contract:
@@ -19,7 +19,7 @@ const func: DeployFunction = async function (
1919
proxyContract: 'OptimizedTransparentProxy',
2020
execute: {
2121
methodName: 'initialize',
22-
args: [TRUSTED_FORWARDER.address, sandAdmin],
22+
args: [SandboxForwarder.address, sandAdmin],
2323
},
2424
upgradeIndex: 0,
2525
},
@@ -34,4 +34,4 @@ func.tags = [
3434
DEPLOY_TAGS.L2_PROD,
3535
DEPLOY_TAGS.L2_TEST,
3636
];
37-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
37+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/17_raffle_care_bears/010_deploy_raffle_care_bears.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
99
const {deployer, upgradeAdmin, treasury, raffleSignWallet} =
1010
await getNamedAccounts();
1111

12-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
12+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1313
let metadataUrl;
1414
if (hre.network.name === 'polygon') {
1515
metadataUrl = 'https://contracts.sandbox.game/carebears-unrevealed/';
@@ -31,7 +31,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3131
'CB',
3232
treasury,
3333
raffleSignWallet,
34-
TRUSTED_FORWARDER.address,
34+
SandboxForwarder.address,
3535
],
3636
},
3737
upgradeIndex: 0,
@@ -49,4 +49,4 @@ func.tags = [
4949
DEPLOY_TAGS.L2_PROD,
5050
DEPLOY_TAGS.L2_TEST,
5151
];
52-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
52+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/18_raffle_playboy_party_people/010_deploy_raffle_playboy_party_people.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
99
const {deployer, upgradeAdmin, treasury, raffleSignWallet} =
1010
await getNamedAccounts();
1111

12-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
12+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1313

1414
let metadataUrl;
1515
if (hre.network.name === 'polygon') {
@@ -32,7 +32,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3232
'PPP',
3333
treasury,
3434
raffleSignWallet,
35-
TRUSTED_FORWARDER.address,
35+
SandboxForwarder.address,
3636
],
3737
},
3838
upgradeIndex: 0,
@@ -50,4 +50,4 @@ func.tags = [
5050
DEPLOY_TAGS.L2_PROD,
5151
DEPLOY_TAGS.L2_TEST,
5252
];
53-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
53+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/20_raffle_rabbids/010_deploy_raffle_rabbids.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -38,7 +38,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3838
'RAB',
3939
treasury,
4040
raffleSignWallet,
41-
TRUSTED_FORWARDER.address,
41+
SandboxForwarder.address,
4242
defaultOperatorFiltererRegistry,
4343
defaultOperatorFiltererSubscription,
4444
true, // we want to subscribe to OpenSea's list
@@ -59,4 +59,4 @@ func.tags = [
5959
DEPLOY_TAGS.L2_PROD,
6060
DEPLOY_TAGS.L2_TEST,
6161
];
62-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
62+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/21_raffle_madballs/010_deploy_raffle_madballs.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -38,7 +38,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3838
'MAD',
3939
treasury,
4040
raffleSignWallet,
41-
TRUSTED_FORWARDER.address,
41+
SandboxForwarder.address,
4242
defaultOperatorFiltererRegistry,
4343
defaultOperatorFiltererSubscription,
4444
true, // we want to subscribe to OpenSea's list
@@ -59,4 +59,4 @@ func.tags = [
5959
DEPLOY_TAGS.L2_PROD,
6060
DEPLOY_TAGS.L2_TEST,
6161
];
62-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
62+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/22_raffle_dancefight/010_deploy_raffle_dancefight.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -38,7 +38,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3838
'DF',
3939
treasury,
4040
raffleSignWallet,
41-
TRUSTED_FORWARDER.address,
41+
SandboxForwarder.address,
4242
defaultOperatorFiltererRegistry,
4343
defaultOperatorFiltererSubscription,
4444
true, // we want to subscribe to OpenSea's list
@@ -59,4 +59,4 @@ func.tags = [
5959
DEPLOY_TAGS.L2_PROD,
6060
DEPLOY_TAGS.L2_TEST,
6161
];
62-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
62+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/23_raffle_hells_kitchen/010_deploy_raffle_hells_kitchen.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -39,7 +39,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3939
'HK',
4040
treasury,
4141
raffleSignWallet,
42-
TRUSTED_FORWARDER.address,
42+
SandboxForwarder.address,
4343
defaultOperatorFiltererRegistry,
4444
defaultOperatorFiltererSubscription,
4545
true, // we want to subscribe to OpenSea's list
@@ -60,4 +60,4 @@ func.tags = [
6060
DEPLOY_TAGS.L2_PROD,
6161
DEPLOY_TAGS.L2_TEST,
6262
];
63-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
63+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/24_raffle_fist_of_the_north_star/010_deploy_raffle_fist_of_the_north_star.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -40,7 +40,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
4040
'FOTNS',
4141
treasury,
4242
raffleSignWallet,
43-
TRUSTED_FORWARDER.address,
43+
SandboxForwarder.address,
4444
defaultOperatorFiltererRegistry,
4545
defaultOperatorFiltererSubscription,
4646
true, // we want to subscribe to OpenSea's list
@@ -61,4 +61,4 @@ func.tags = [
6161
DEPLOY_TAGS.L2_PROD,
6262
DEPLOY_TAGS.L2_TEST,
6363
];
64-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
64+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/26_raffle_paris_hilton/010_deploy_raffle_paris_hilton.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1515
defaultOperatorFiltererSubscription,
1616
} = await getNamedAccounts();
1717

18-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
18+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1919

2020
let metadataUrl;
2121
if (hre.network.name === 'polygon') {
@@ -39,7 +39,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3939
'PH',
4040
treasury,
4141
raffleSignWallet,
42-
TRUSTED_FORWARDER.address,
42+
SandboxForwarder.address,
4343
defaultOperatorFiltererRegistry,
4444
defaultOperatorFiltererSubscription,
4545
true, // we want to subscribe to OpenSea's list
@@ -60,4 +60,4 @@ func.tags = [
6060
DEPLOY_TAGS.L2_PROD,
6161
DEPLOY_TAGS.L2_TEST,
6262
];
63-
func.dependencies = ['TRUSTED_FORWARDER_V2'];
63+
func.dependencies = ['SandboxForwarder'];

‎packages/deploy/deploy/27_avatar_implementations/deploy_mock_collection_AvatarCollection.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
2222
} = await getNamedAccounts();
2323

2424
// setup arguments
25-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2'); // Metatransaction address
25+
const SandboxForwarder = await deployments.get('SandboxForwarder'); // Metatransaction address
2626

2727
// This deployment script worked when PolygonSand was also in the deploy scripts. This was in core package
2828
// For now, we hardcode the address here directly sandContractAddress
@@ -95,7 +95,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
9595
collectionSymbol,
9696
treasury,
9797
raffleSignWallet,
98-
TRUSTED_FORWARDER.address,
98+
SandboxForwarder.address,
9999
// sandContract.address,
100100
sandContractAddress,
101101
MAX_SUPPLY,
@@ -180,5 +180,5 @@ func.tags = [
180180
func.dependencies = [
181181
'PolygonSand_deploy',
182182
'CollectionFactory_deploy_beacon_main_avatar',
183-
'TRUSTED_FORWARDER_V2',
183+
'SandboxForwarder',
184184
];

‎packages/deploy/deploy/28_nft_collection/100_deploy_nft_collection_mock.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
3030
const MAX_SUPPLY = 500;
3131
const MAX_TOKENS_PER_WALLET = 2;
3232

33-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
33+
const SandboxForwarder = await deployments.get('SandboxForwarder');
3434
const sandContract = await deployments.get('PolygonSand');
3535
const implementation = await ethers.getContract(
3636
'NFTCollection_Implementation'
@@ -45,7 +45,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
4545
collectionSymbol,
4646
treasury,
4747
raffleSignWallet,
48-
TRUSTED_FORWARDER.address,
48+
SandboxForwarder.address,
4949
sandContract.address,
5050
MAX_SUPPLY,
5151
MAX_TOKENS_PER_WALLET,
@@ -87,5 +87,5 @@ func.tags = [
8787
func.dependencies = [
8888
'PolygonNFTCollectionBeacon_deploy',
8989
'PolygonSand_deploy',
90-
'TRUSTED_FORWARDER_V2',
90+
'SandboxForwarder',
9191
];

‎packages/deploy/deploy/28_nft_collection/101_save_nft_collection_mock_for_verification.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
1717
const collectionSymbol = 'TEST';
1818
const MAX_SUPPLY = 500;
1919
const MAX_TOKENS_PER_WALLET = 2;
20-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
20+
const SandboxForwarder = await deployments.get('SandboxForwarder');
2121
const sandContract = await deployments.get('PolygonSand');
2222
const implementation = await ethers.getContract(
2323
'NFTCollection_Implementation'
@@ -45,7 +45,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
4545
collectionSymbol,
4646
treasury,
4747
raffleSignWallet,
48-
TRUSTED_FORWARDER.address,
48+
SandboxForwarder.address,
4949
sandContract.address,
5050
MAX_SUPPLY,
5151
MAX_TOKENS_PER_WALLET,

‎packages/deploy/deploy/300_catalyst/301_deploy_catalyst.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const func: DeployFunction = async function (
2323
const {deployer, upgradeAdmin, catalystMinter, catalystAdmin} =
2424
await getNamedAccounts();
2525

26-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
26+
const SandboxForwarder = await deployments.get('SandboxForwarder');
2727
const OperatorFilterCatalystSubscription = await deployments.get(
2828
'OperatorFilterCatalystSubscription'
2929
);
@@ -40,7 +40,7 @@ const func: DeployFunction = async function (
4040
methodName: 'initialize',
4141
args: [
4242
CATALYST_BASE_URI,
43-
TRUSTED_FORWARDER.address,
43+
SandboxForwarder.address,
4444
OperatorFilterCatalystSubscription.address,
4545
catalystAdmin, // DEFAULT_ADMIN_ROLE
4646
catalystMinter, // MINTER_ROLE
@@ -65,5 +65,5 @@ func.tags = [
6565
func.dependencies = [
6666
'OperatorFilterCatalystSubscription_deploy',
6767
'RoyaltyManager_deploy',
68-
'TRUSTED_FORWARDER_V2',
68+
'SandboxForwarder',
6969
];

‎packages/deploy/deploy/400_asset/402_deploy_asset.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
77
const {deploy} = deployments;
88
const {deployer, assetAdmin, upgradeAdmin} = await getNamedAccounts();
99

10-
const TRUSTED_FORWARDER = await deployments.get('TRUSTED_FORWARDER_V2');
10+
const SandboxForwarder = await deployments.get('SandboxForwarder');
1111
const RoyaltyManager = await deployments.get('RoyaltyManager');
1212
const OperatorFilterAssetSubscription = await deployments.get(
1313
'OperatorFilterAssetSubscription'
@@ -22,7 +22,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
2222
execute: {
2323
methodName: 'initialize',
2424
args: [
25-
TRUSTED_FORWARDER.address,
25+
SandboxForwarder.address,
2626
assetAdmin,
2727
'ipfs://',
2828
OperatorFilterAssetSubscription.address,
@@ -45,6 +45,6 @@ func.tags = [
4545
];
4646
func.dependencies = [
4747
'OperatorFilterAssetSubscription_deploy',
48-
'TRUSTED_FORWARDER_V2',
48+
'SandboxForwarder',
4949
'RoyaltyManager_deploy',
5050
];

0 commit comments

Comments
 (0)