From 42a0eb634510967bbb0765447459b72d301ec0e6 Mon Sep 17 00:00:00 2001 From: Brandon R <54774639+b-j-roberts@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:23:50 -0500 Subject: [PATCH] new sepolia deployment (#252) --- configs/sepolia-contracts.config.json | 6 +++--- frontend/src/App.js | 2 +- infra/art-peace-infra/Chart.yaml | 2 +- infra/art-peace-infra/values.yaml | 10 +++++----- onchain/src/art_peace.cairo | 2 +- tests/integration/docker/deploy.sh | 2 +- tests/integration/docker/update_devnet.sh | 4 ++-- tests/integration/mainnet/deploy.sh | 2 +- tests/integration/sepolia/deploy.sh | 6 +++--- tests/integration/sepolia/deploy_quests.sh | 6 +++--- tests/integration/sepolia/setup_factions.sh | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configs/sepolia-contracts.config.json b/configs/sepolia-contracts.config.json index 1fb5f4d6..a296d7ff 100644 --- a/configs/sepolia-contracts.config.json +++ b/configs/sepolia-contracts.config.json @@ -1,7 +1,7 @@ { - "usernameStore": "0x073128a9f7b38d2bcdb6c1f9ef4fea357de4dfe2fab5832c1e7b51e9aae97c51", - "artPeace": "0x04d88b27976e74363163d97d6eb4505007c102b7c7cdb8b7bac5ea75fec6e998", - "canvasNFT": "0x040d7f7a6ec27d8ffc9e993ac9b307007356c3b3c6d5b12717953659ccd3df51", + "usernameStore": "0x051cf8214d781f5ee503cb668505e58f0374bfd602145560ba1b897eb98f2e1a", + "artPeace": "0x06fde2e43914b859e7e554585d3bc0dbf93d3b0187096a7bdb2c4fe1d4e1547d", + "canvasNFT": "0x01adf4e09484800190e50e597df40a94611c2c8a2277f536e448f0c0dc82930f", "pixelQuest": "0x0715004f8805f938b1d42b0bce12a9b1dc49ec55bb2c401ea9c4695461960576" } diff --git a/frontend/src/App.js b/frontend/src/App.js index d1dde711..b6683c15 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -263,7 +263,7 @@ function App() { const updateInterval = 1000; // 1 second // TODO: make this a config - const timeBetweenPlacements = 120000; // 2 minutes + const timeBetweenPlacements = 30000; // 30 seconds const [basePixelTimer, setBasePixelTimer] = useState('XX:XX'); useEffect(() => { const updateBasePixelTimer = () => { diff --git a/infra/art-peace-infra/Chart.yaml b/infra/art-peace-infra/Chart.yaml index 7599e06a..cb715474 100644 --- a/infra/art-peace-infra/Chart.yaml +++ b/infra/art-peace-infra/Chart.yaml @@ -4,4 +4,4 @@ description: Helm charts for the art/peace infrastructure type: application version: 0.1.0 -appVersion: "v1.0.0" +appVersion: "v1.1.0" diff --git a/infra/art-peace-infra/values.yaml b/infra/art-peace-infra/values.yaml index 9b6a6fad..e87d6d14 100644 --- a/infra/art-peace-infra/values.yaml +++ b/infra/art-peace-infra/values.yaml @@ -79,8 +79,8 @@ apibara: authToken: dna_aabbcc contracts: - artPeace: 0x0384e5fa826e1151715dbc3df0bd1b3aaec234dfc344394d02c39b670e354c48 - usernameStore: 0x03d9ac2a08d83dcbcf7a05358dd77e05d2b094d3c13232611fe86ee957c34d02 - nft: 0x009835b97a6756aca76edfd603aacb386d81fc5c34148912a306e9c22a61b748 - host: "05bd7adfe8afaa58300adc72bf5584b191e236987fe16a217b1a3e067869a0aa" - end: "1720776600" + artPeace: 0x06fde2e43914b859e7e554585d3bc0dbf93d3b0187096a7bdb2c4fe1d4e1547d + usernameStore: 0x051cf8214d781f5ee503cb668505e58f0374bfd602145560ba1b897eb98f2e1a + nft: 0x01adf4e09484800190e50e597df40a94611c2c8a2277f536e448f0c0dc82930f + host: "07C313Ea8b45044c2272B77eC7332B65bdFef089c4De0FFfaB3De3FD6b85d124" + end: "1727483400" diff --git a/onchain/src/art_peace.cairo b/onchain/src/art_peace.cairo index 4a7c180c..852ed67e 100644 --- a/onchain/src/art_peace.cairo +++ b/onchain/src/art_peace.cairo @@ -408,7 +408,7 @@ pub mod ArtPeace { let block_timestamp = starknet::get_block_timestamp(); // TODO: To config? let leanience_margin = 20; // 20 seconds - let expected_block_time = 6 * 60; // 6 minutes + let expected_block_time = 30; // 30 seconds assert(now >= block_timestamp - leanience_margin, 'Timestamp too far behind'); assert(now <= block_timestamp + 2 * expected_block_time, 'Timestamp too far ahead'); } diff --git a/tests/integration/docker/deploy.sh b/tests/integration/docker/deploy.sh index 57a103ff..2eab87f2 100755 --- a/tests/integration/docker/deploy.sh +++ b/tests/integration/docker/deploy.sh @@ -42,7 +42,7 @@ CANVAS_CONFIG=$WORK_DIR/configs/canvas.config.json QUESTS_CONFIG=$WORK_DIR/configs/quests.config.json WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG) HEIGHT=$(jq -r '.canvas.height' $CANVAS_CONFIG) -PLACE_DELAY=120 +PLACE_DELAY=30 COLOR_COUNT=$(jq -r '.colors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/') VOTABLE_COLOR_COUNT=$(jq -r '.votableColors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') diff --git a/tests/integration/docker/update_devnet.sh b/tests/integration/docker/update_devnet.sh index eabb8d20..5d48d6a4 100755 --- a/tests/integration/docker/update_devnet.sh +++ b/tests/integration/docker/update_devnet.sh @@ -1,9 +1,9 @@ #!/bin/bash -# Start a new block every 6 minutes +# Start a new block every 30 seconds echo "Starting the block producer" -INTERVAL=360 +INTERVAL=30 while true do diff --git a/tests/integration/mainnet/deploy.sh b/tests/integration/mainnet/deploy.sh index 60f07956..b1bb80a9 100755 --- a/tests/integration/mainnet/deploy.sh +++ b/tests/integration/mainnet/deploy.sh @@ -98,7 +98,7 @@ QUESTS_CONFIG=$PROJECT_ROOT/configs/production-quests.config.json ACCOUNT_ADDRESS=$(cat $STARKNET_ACCOUNT | jq -r '.deployment.address') WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG) HEIGHT=$(jq -r '.canvas.height' $CANVAS_CONFIG) -PLACE_DELAY=0x78 +PLACE_DELAY=0x1E COLOR_COUNT=$(jq -r '.colors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/') VOTABLE_COLOR_COUNT=$(jq -r '.votableColors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') diff --git a/tests/integration/sepolia/deploy.sh b/tests/integration/sepolia/deploy.sh index 03b5a760..ad4169bc 100755 --- a/tests/integration/sepolia/deploy.sh +++ b/tests/integration/sepolia/deploy.sh @@ -98,14 +98,14 @@ QUESTS_CONFIG=$PROJECT_ROOT/configs/production-quests.config.json ACCOUNT_ADDRESS=$(cat $STARKNET_ACCOUNT | jq -r '.deployment.address') WIDTH=$(jq -r '.canvas.width' $CANVAS_CONFIG) HEIGHT=$(jq -r '.canvas.height' $CANVAS_CONFIG) -PLACE_DELAY=0x78 +PLACE_DELAY=0x1E COLOR_COUNT=$(jq -r '.colors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') COLORS=$(jq -r '.colors[]' $CANVAS_CONFIG | sed 's/^/0x/') VOTABLE_COLOR_COUNT=$(jq -r '.votableColors[]' $CANVAS_CONFIG | wc -l | tr -d ' ') VOTABLE_COLORS=$(jq -r '.votableColors[]' $CANVAS_CONFIG | sed 's/^/0x/') DAILY_NEW_COLORS_COUNT=3 -START_TIME=1720399517 -END_TIME=1721399517 +START_TIME=1726192577 +END_TIME=1727483400 DEVNET_MODE=0 DAILY_QUESTS_COUNT=$(jq -r '.daily.dailyQuestsCount' $QUESTS_CONFIG) diff --git a/tests/integration/sepolia/deploy_quests.sh b/tests/integration/sepolia/deploy_quests.sh index 9d1489fb..4c48df5c 100755 --- a/tests/integration/sepolia/deploy_quests.sh +++ b/tests/integration/sepolia/deploy_quests.sh @@ -20,9 +20,9 @@ elif [ -z "$STARKNET_ACCOUNT" ]; then exit 1 fi -ART_PEACE_CONTRACT_ADDRESS=0x04d88b27976e74363163d97d6eb4505007c102b7c7cdb8b7bac5ea75fec6e998 -CANVAS_NFT_CONTRACT=0x040d7f7a6ec27d8ffc9e993ac9b307007356c3b3c6d5b12717953659ccd3df51 -USERNAME_STORE_CONTRACT=0x073128a9f7b38d2bcdb6c1f9ef4fea357de4dfe2fab5832c1e7b51e9aae97c51 +ART_PEACE_CONTRACT_ADDRESS=0x06fde2e43914b859e7e554585d3bc0dbf93d3b0187096a7bdb2c4fe1d4e1547d +CANVAS_NFT_CONTRACT=0x01adf4e09484800190e50e597df40a94611c2c8a2277f536e448f0c0dc82930f +USERNAME_STORE_CONTRACT=0x051cf8214d781f5ee503cb668505e58f0374bfd602145560ba1b897eb98f2e1a CONTRACT_DIR=$WORK_DIR/onchain diff --git a/tests/integration/sepolia/setup_factions.sh b/tests/integration/sepolia/setup_factions.sh index 2a92d7fb..1db5a2d0 100755 --- a/tests/integration/sepolia/setup_factions.sh +++ b/tests/integration/sepolia/setup_factions.sh @@ -20,7 +20,7 @@ elif [ -z "$STARKNET_ACCOUNT" ]; then exit 1 fi -ART_PEACE_CONTRACT_ADDRESS=0x04d88b27976e74363163d97d6eb4505007c102b7c7cdb8b7bac5ea75fec6e998 +ART_PEACE_CONTRACT_ADDRESS=0x06fde2e43914b859e7e554585d3bc0dbf93d3b0187096a7bdb2c4fe1d4e1547d FACTIONS_CONFIG_FILE=$WORK_DIR/configs/factions.config.json