Skip to content

Commit 79433cb

Browse files
Merge pull request #1679 from thesandboxgame/trusted-forwarder-package
SandboxForwarder Package
2 parents ce182c2 + 4d9f799 commit 79433cb

Some content is hidden

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

43 files changed

+698
-96
lines changed

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

Lines changed: 3 additions & 3 deletions
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/100_claim/100_multi_claim.ts

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 3 additions & 3 deletions
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'];

0 commit comments

Comments
 (0)