code formatting

contracts/SocialToken.cdc

@@ -116,8 +116,7 @@ pub contract SocialToken : FungibleToken{
         let newSupply = supply + amount
         let reserve = tokenDetails.reserve
         if supply == 0.0 {
-            let a :UFix64 = 10000.0
-            return ( (tokenDetails.slope * amount * amount)/2.0/a ) 
+            return (tokenDetails.slope.saturatingMultiply((amount.saturatingMultiply(amount)))/2.0/10000.0) 
         } else {
             var totalNewSupply = newSupply.saturatingMultiply(newSupply)
             return (((reserve.saturatingMultiply(totalNewSupply) / supply.saturatingMultiply(supply))) - reserve)

scripts/getTokenDetails.cdc

@@ -1,5 +1,5 @@
 
 import Controller from 0xf8d6e0586b0a20c7
 pub fun main(name:String): Controller.TokenStructure? {
-  return Controller.allSocialTokens[name]
+  return Controller.getTokenDetails(name)
 }

scripts/get_issued_supply.cdc

@@ -1,6 +1,6 @@
 
 import Controller from 0xf8d6e0586b0a20c7
 
-pub fun main(name:String): UFix64 {
-  return Controller.allSocialTokens[name].issuedSupply
+pub fun main(name: String): UFix64 {
+  return Controller.getTokenDetails(name).issuedSupply
 }

tasks/burn_with_collateral/main.go

@@ -18,9 +18,9 @@ func main() {
 	//FUSD//
 
 	//Setup FUSD Vaults for both accounts
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull()
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
@@ -43,9 +43,6 @@ func main() {
 	flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("social_token/setup_social_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
-
 	//Admin Account deposits minter into first account
 	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 

tasks/mint_burn_instant/main.go

@@ -20,19 +20,19 @@ func main() {
 
 	//Setup FUSD Vaults for all accounts
 	log.Printf(" ------")
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
 
 	//Admin Account deposits minter into first account
-	flow.TransactionFromFile("setMinterProxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
+	flow.TransactionFromFile("set_minter_proxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
 	// First Account Mints and deposits in one transaction
 	flow.TransactionFromFile("mint_fusd").SignProposeAndPayAs("first").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
@@ -53,28 +53,27 @@ func main() {
 	//-------------------------------------------------//
 
 	//Setup SocialToken Vaults for both accounts
-	flow.TransactionFromFile("setup_social_vault").SignProposeAndPayAs("second").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_social_vault").SignProposeAndPayAs("second").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunPrintEventsFull()
 	//flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter").StringArgument("TestSymbol_0x1cf0e2f2f715450").SignProposeAndPayAs("second").RunPrintEventsFull()
 
-	//Admin Account deposits minter into first account
-	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
-	TokenDetails := flow.ScriptFromFile("getTokenDetails").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
-	log.Printf(" ------ Social Token Details ----- %s", TokenDetails)
 
 	mintQuote := flow.ScriptFromFile("get_social_mint_quote").UFix64Argument("10000000.00").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
+
 	// mint social Tokens
 	flow.TransactionFromFile("mint_social_token").SignProposeAndPayAs("second").StringArgument("TestSymbol_0x1cf0e2f2f715450").UFix64Argument("10000000.00").UFix64Argument(mintQuote.String()).RunPrintEventsFull()
 
 	log.Printf(" ------ Social Mint Quote ----- %s", mintQuote)
-
+	//Admin Account deposits minter into first account
+	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
+	TokenDetails := flow.ScriptFromFile("getTokenDetails").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
+	log.Printf(" ------ Social Token Details ----- %s", TokenDetails)
+
 	// Get the balance of all accounts
-	ArtistAccountBalance := flow.ScriptFromFile("getreserve").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
-	log.Printf(" ------ get Reserve ----- %s", ArtistAccountBalance)
+	ArtistAccountBalance := flow.ScriptFromFile("get_issued_supply").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
+	log.Printf(" ------ get Issued Supply ----- %s", ArtistAccountBalance)
 
-	BurnPrice := flow.ScriptFromFile("get_social_burn_quote").UFix64Argument("9999999.00").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
+	BurnPrice := flow.ScriptFromFile("get_social_burn_quote").UFix64Argument("10000000.00").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()
 	log.Printf(" ------ User Burn Price ----- %s", BurnPrice)
 
 	UserSocialBalance := flow.ScriptFromFile("get_social_balance").AccountArgument("second").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()

tasks/mint_fusd/main.go

@@ -12,8 +12,8 @@ func main() {
 	g := gwtf.NewGoWithTheFlowInMemoryEmulator()
 
 	//Setup FUSD Vaults for both accounts
-	g.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull();
-	g.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull();
+	g.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull();
+	g.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull();
 
 	//First Account sets up FUSD Minter
 	g.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull();

tasks/mint_with_collateral/main.go

@@ -18,9 +18,9 @@ func main() {
 	//FUSD//
 
 	//Setup FUSD Vaults for all accounts
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
@@ -50,9 +50,6 @@ func main() {
 	flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	//flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("social_token/setup_social_minter").StringArgument("TestSymbol_0x1cf0e2f2f715450").SignProposeAndPayAs("first").RunPrintEventsFull()
-
 	//Admin Account deposits minter into first account
 	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 	mintQuote := flow.ScriptFromFile("getTokenDetails").StringArgument("TestSymbol_0x1cf0e2f2f715450").RunFailOnError()

tasks/mint_with_fee_distribution/main.go

@@ -19,19 +19,19 @@ func main() {
 
 	//Setup FUSD Vaults for all accounts
 	log.Printf(" ------")
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
 
 	//Admin Account deposits minter into first account
-	flow.TransactionFromFile("setMinterProxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
+	flow.TransactionFromFile("set_minter_proxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
 	// First Account Mints and deposits in one transaction
 	flow.TransactionFromFile("mint_fusd").SignProposeAndPayAs("first").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
@@ -53,9 +53,6 @@ func main() {
 	flow.TransactionFromFile("setup_social_vault").SignProposeAndPayAs("second").RunPrintEventsFull()
 	//flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter").StringArgument("S_0x1cf0e2f2f715450").SignProposeAndPayAs("second").RunPrintEventsFull()
-
 	//Admin Account deposits minter into first account
 	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 

tasks/transfer_token_different_vaults_negative/main.go

@@ -19,19 +19,19 @@ func main() {
 
 	//Setup FUSD Vaults for all accounts
 	log.Printf(" ------")
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
 
 	//Admin Account deposits minter into first account
-	flow.TransactionFromFile("setMinterProxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
+	flow.TransactionFromFile("set_minter_proxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
 	// First Account Mints and deposits in one transaction
 	flow.TransactionFromFile("mint_fusd").SignProposeAndPayAs("first").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
@@ -55,9 +55,6 @@ func main() {
 	flow.TransactionFromFile("setup_social_vault").SignProposeAndPayAs("second").RunPrintEventsFull()
 	//flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter").StringArgument("S_0x1cf0e2f2f715450").SignProposeAndPayAs("second").RunPrintEventsFull()
-
 	//Admin Account deposits minter into first account
 	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
@@ -81,7 +78,6 @@ func main() {
 	//Register Token for a new account
 	flow.TransactionFromFile("registerToken2").SignProposeAndPayAs("account").StringArgument("N").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
 	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter2").StringArgument("N_0x179b6b1cb6755e31").SignProposeAndPayAs("second").RunPrintEventsFull()
 	mintQuote = flow.ScriptFromFile("get_social_mint_quote").UFix64Argument("10.00").StringArgument("N_0x179b6b1cb6755e31").RunFailOnError()
 	log.Printf(" ------ Social Mint Quote N Before ----- %s", mintQuote)
 

tasks/transfer_token_same_vaults/main.go

@@ -19,19 +19,19 @@ func main() {
 
 	//Setup FUSD Vaults for all accounts
 	log.Printf(" ------")
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull()
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 	log.Printf(" ---")
 
-	flow.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
+	flow.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("second").RunPrintEventsFull() // Artist Vault
 
 	//First Account sets up FUSD Minter
 	flow.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
 
 	//Admin Account deposits minter into first account
-	flow.TransactionFromFile("setMinterProxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
+	flow.TransactionFromFile("set_minter_proxy").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
 	// First Account Mints and deposits in one transaction
 	flow.TransactionFromFile("mint_fusd").SignProposeAndPayAs("first").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
@@ -55,9 +55,6 @@ func main() {
 	flow.TransactionFromFile("setup_social_vault").SignProposeAndPayAs("second").RunPrintEventsFull()
 	//flow.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter").StringArgument("S_0x1cf0e2f2f715450").SignProposeAndPayAs("second").RunPrintEventsFull()
-
 	//Admin Account deposits minter into first account
 	//	flow.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 
@@ -81,7 +78,6 @@ func main() {
 	//Register Token for a new account
 	flow.TransactionFromFile("registerToken2").SignProposeAndPayAs("account").StringArgument("N").UFix64Argument("10000000.00").AccountArgument("second").RunPrintEventsFull()
 	//First Account sets up Social Minter
-	flow.TransactionFromFile("setup_social_minter2").StringArgument("N_0x179b6b1cb6755e31").SignProposeAndPayAs("second").RunPrintEventsFull()
 	mintQuote = flow.ScriptFromFile("get_social_mint_quote").UFix64Argument("10.00").StringArgument("N_0x179b6b1cb6755e31").RunFailOnError()
 	log.Printf(" ------ Social Mint Quote N Before ----- %s", mintQuote)
 

tasks/user_story/main.go

@@ -22,8 +22,8 @@ func main() {
 	//-------------------------------------------------//
 
 	//Setup FUSD Vaults for both accounts
-	g.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("first").RunPrintEventsFull();
-	g.TransactionFromFile("setupFusdVault").SignProposeAndPayAs("account").RunPrintEventsFull();
+	g.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("first").RunPrintEventsFull();
+	g.TransactionFromFile("setup_fusd_vault").SignProposeAndPayAs("account").RunPrintEventsFull();
 
 	//First Account sets up FUSD Minter
 	g.TransactionFromFile("setup_fusd_minter").SignProposeAndPayAs("first").RunPrintEventsFull();
@@ -46,9 +46,6 @@ func main() {
 	g.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("first").RunPrintEventsFull()
 	g.TransactionFromFile("social_token/setup_social_vault").SignProposeAndPayAs("account").RunPrintEventsFull()
 
-	//First Account sets up Social Minter
-	g.TransactionFromFile("social_token/setup_social_minter").SignProposeAndPayAs("first").RunPrintEventsFull()
-
 	//Admin Account deposits  minter into first account
 	g.TransactionFromFile("social_token/deposit_social_minter").SignProposeAndPayAs("account").AccountArgument("first").RunPrintEventsFull()
 

test/js/index-test.test.js

@@ -120,7 +120,7 @@ describe("Deployment", () => {
 
 describe("Transactions", () => {
   test("test transaction for setup admin account", async () => {
-    const name = "setupAdminAccount"
+    const name = "setup_admin_account"
     const Dave = await getAccountAddress("Dave")
     const signers = [Dave]
     const Controller = await getContractAddress("Controller")
@@ -142,7 +142,7 @@ describe("Transactions", () => {
     }
   })
   test("test transaction for add admin account", async () => {
-    const name = "addAdminAccount"
+    const name = "add_admin_account"
     const Charlie = await getAccountAddress("Charlie")
     const signers = [Charlie]
     const Controller = await getContractAddress("Controller")
@@ -205,7 +205,7 @@ describe("Transactions", () => {
     // expect(txResult[0].errorMessage).toBe("");
   });
   test("test transaction setup fusd vault", async () => {
-    const name = "setupFusdVault";
+    const name = "setup_fusd_vault";
 
     const accountNames = ["Charlie", "Eve", "Faythe"]
     for (var i = 0; i < accountNames.length; i++) {
@@ -270,7 +270,7 @@ describe("Transactions", () => {
     // expect(txResult[0].errorMessage).toBe("");
   });
   test("test transaction set minter FUSD", async () => {
-    const name = "setMinterProxy";
+    const name = "set_minter_proxy";
 
     // Import participating accounts
     const Bob = await getAccountAddress("Bob");