From b9e3f8fa33e425ff8a0f5ff13f7bcc36228d7edf Mon Sep 17 00:00:00 2001
From: dbeal <git@dbeal.dev>
Date: Fri, 12 Apr 2024 21:36:11 +0900
Subject: [PATCH] fix name clash in cannonfile (#238)

on updated versions of cannon, build fails because extras was merged into settings
---
 contracts/cannonfile.toml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/contracts/cannonfile.toml b/contracts/cannonfile.toml
index 5d74106fe..32038ae72 100644
--- a/contracts/cannonfile.toml
+++ b/contracts/cannonfile.toml
@@ -36,8 +36,6 @@ target = ["core_sandbox.synthetix.CoreProxy"]
 from = "<%= settings.test_user %>"
 func = "createAccount(uint128)"
 args = ["<%= settings.test_user_account_id %>"]
-extra.test_user_account_id.event = "AccountCreated"
-extra.test_user_account_id.arg = 0
 
 [invoke.mint_10k_box]
 target = ["core_sandbox.box_token.MintableToken"]
@@ -60,7 +58,7 @@ target = ["core_sandbox.synthetix.CoreProxy"]
 from = "<%= settings.test_user %>"
 func = "deposit"
 args = [
-    "<%= extras.test_user_account_id %>",
+    "<%= settings.test_user_account_id %>",
     "<%= imports.core_sandbox.imports.box_token.contracts.MintableToken.address %>",
     "<%= parseEther('1000') %>",
 ]
@@ -72,7 +70,7 @@ from = "<%= settings.test_user %>"
 func = "delegateCollateral"
 args = [
     # examples of how to debug internal values line by line
-    "<%= /* console.log(extras) || */ extras.test_user_account_id %>",
+    "<%= /* console.log(extras) || */ settings.test_user_account_id %>",
     "<%= /* console.log(imports.core_sandbox.extras) || */imports.core_sandbox.extras.spartan_council_pool_id %>",
     "<%= /* console.log(imports.core_sandbox.imports) || */ imports.core_sandbox.imports.box_token.contracts.MintableToken.address %>",
     "<%= parseEther('900') %>",
@@ -85,7 +83,7 @@ target = ["core_sandbox.synthetix.CoreProxy"]
 from = "<%= settings.test_user %>"
 func = "mintUsd"
 args = [
-    "<%= extras.test_user_account_id %>",
+    "<%= settings.test_user_account_id %>",
     "<%= imports.core_sandbox.extras.spartan_council_pool_id %>",
     "<%= imports.core_sandbox.imports.box_token.contracts.MintableToken.address %>",
     "<%= parseEther('300') %>",
@@ -97,7 +95,7 @@ target = ["core_sandbox.synthetix.CoreProxy"]
 from = "<%= settings.test_user %>"
 func = "withdraw"
 args = [
-    "<%= extras.test_user_account_id %>",
+    "<%= settings.test_user_account_id %>",
     "<%= imports.core_sandbox.imports.synthetix.contracts.USDProxy.address %>",
     "<%= parseEther('300') %>",
 ]