diff --git a/contracts/SocialToken.cdc b/contracts/SocialToken.cdc index b0338a1..63b2315 100644 --- a/contracts/SocialToken.cdc +++ b/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) diff --git a/scripts/getAllTokenIds.cdc b/scripts/getAllTokenIds.cdc deleted file mode 100644 index 1a7ca64..0000000 --- a/scripts/getAllTokenIds.cdc +++ /dev/null @@ -1,5 +0,0 @@ - -import Controller from "../contracts/Controller.cdc" -pub fun main():[String]{ - return Controller.allSocialTokens.keys -} diff --git a/scripts/getTokenDetails.cdc b/scripts/getTokenDetails.cdc index e20e830..c542886 100644 --- a/scripts/getTokenDetails.cdc +++ b/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) } \ No newline at end of file diff --git a/scripts/get_issued_supply.cdc b/scripts/get_issued_supply.cdc index 59c8480..5f5e382 100644 --- a/scripts/get_issued_supply.cdc +++ b/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 } \ No newline at end of file diff --git a/scripts/get_social_balance_7.cdc b/scripts/get_social_balance_7.cdc deleted file mode 100644 index c6bbd50..0000000 --- a/scripts/get_social_balance_7.cdc +++ /dev/null @@ -1,11 +0,0 @@ -import FungibleToken from 0xee82856bf20e2aa6 -import SocialToken from "../contracts/SocialToken.cdc" - -pub fun main(account: Address): UFix64 { - let acct = getAccount(account) - let vaultRef = acct.getCapability(/public/S_0x5) - .borrow<&SocialToken.Vault{FungibleToken.Balance}>() - ?? panic("Could not borrow Balance reference to the Vault") - - return vaultRef.balance -} \ No newline at end of file diff --git a/scripts/get_social_balance_8.cdc b/scripts/get_social_balance_8.cdc deleted file mode 100644 index a73bc64..0000000 --- a/scripts/get_social_balance_8.cdc +++ /dev/null @@ -1,11 +0,0 @@ -import FungibleToken from 0xee82856bf20e2aa6 -import SocialToken from "../contracts/SocialToken.cdc" - -pub fun main(account: Address): UFix64 { - let acct = getAccount(account) - let vaultRef = acct.getCapability(/public/N_0x6) - .borrow<&SocialToken.Vault{FungibleToken.Balance}>() - ?? panic("Could not borrow Balance reference to the Vault") - - return vaultRef.balance -} \ No newline at end of file diff --git a/tasks/burn_with_collateral/main.go b/tasks/burn_with_collateral/main.go index 9071021..155348d 100644 --- a/tasks/burn_with_collateral/main.go +++ b/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() diff --git a/tasks/mint_burn_instant/main.go b/tasks/mint_burn_instant/main.go index 2ee3aa1..26dde44 100644 --- a/tasks/mint_burn_instant/main.go +++ b/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() diff --git a/tasks/mint_fusd/main.go b/tasks/mint_fusd/main.go index d0bcd3b..5b1446e 100644 --- a/tasks/mint_fusd/main.go +++ b/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(); diff --git a/tasks/mint_with_collateral/main.go b/tasks/mint_with_collateral/main.go index 14a70d9..c595806 100644 --- a/tasks/mint_with_collateral/main.go +++ b/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() diff --git a/tasks/mint_with_fee_distribution/main.go b/tasks/mint_with_fee_distribution/main.go index 08c4011..2404fd6 100644 --- a/tasks/mint_with_fee_distribution/main.go +++ b/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() diff --git a/tasks/transfer_token_different_vaults_negative/main.go b/tasks/transfer_token_different_vaults_negative/main.go index e35d972..f2e86d1 100644 --- a/tasks/transfer_token_different_vaults_negative/main.go +++ b/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) diff --git a/tasks/transfer_token_same_vaults/main.go b/tasks/transfer_token_same_vaults/main.go index 017a8d4..adef5f5 100644 --- a/tasks/transfer_token_same_vaults/main.go +++ b/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) diff --git a/tasks/user_story/main.go b/tasks/user_story/main.go index 0ffe1b8..c5a4a9a 100644 --- a/tasks/user_story/main.go +++ b/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() diff --git a/test/js/index-test.test.js b/test/js/index-test.test.js index 1688cfe..aed8b61 100644 --- a/test/js/index-test.test.js +++ b/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"); diff --git a/transactions/addAdminAccount.cdc b/transactions/add_admin_account.cdc similarity index 100% rename from transactions/addAdminAccount.cdc rename to transactions/add_admin_account.cdc diff --git a/transactions/setMinterProxy.cdc b/transactions/set_minter_proxy.cdc similarity index 100% rename from transactions/setMinterProxy.cdc rename to transactions/set_minter_proxy.cdc diff --git a/transactions/setupAdminAccount.cdc b/transactions/setup_admin_account.cdc similarity index 100% rename from transactions/setupAdminAccount.cdc rename to transactions/setup_admin_account.cdc diff --git a/transactions/setupFusdVault.cdc b/transactions/setup_fusd_vault.cdc similarity index 100% rename from transactions/setupFusdVault.cdc rename to transactions/setup_fusd_vault.cdc diff --git a/transactions/setup_social_minter.cdc b/transactions/setup_social_minter.cdc deleted file mode 100644 index daf7972..0000000 --- a/transactions/setup_social_minter.cdc +++ /dev/null @@ -1,22 +0,0 @@ -// This transaction creates a new minter proxy resource and -// stores it in the signer's account. -// -// After running this transaction, the Social Token administrator -// must run deposit_st_minter.cdc to deposit a minter resource -// inside the minter proxy. - -import SocialToken from 0xf8d6e0586b0a20c7 - -transaction { - prepare(minter: AuthAccount) { - - let minterProxy <- SocialToken.createMinterProxy() - - minter.save(<- minterProxy, to: SocialToken.MinterProxyStoragePath) - - minter.link<&SocialToken.MinterProxy{SocialToken.MinterProxyPublic}>( - SocialToken.MinterProxyPublicPath, - target: SocialToken.MinterProxyStoragePath - ) - } -} diff --git a/transactions/setup_social_minter2.cdc b/transactions/setup_social_minter2.cdc deleted file mode 100644 index 2ea44f6..0000000 --- a/transactions/setup_social_minter2.cdc +++ /dev/null @@ -1,30 +0,0 @@ -// This transaction creates a new minter proxy resource and -// stores it in the signer's account. -// -// After running this transaction, the Social Token administrator -// must run deposit_st_minter.cdc to deposit a minter resource -// inside the minter proxy. - -import SocialToken from 0xf8d6e0586b0a20c7 -import FungibleToken from 0xee82856bf20e2aa6 -import Controller from 0xf8d6e0586b0a20c7 - -transaction (tokenId: String) { - - prepare(acct: AuthAccount) { - - acct.save(<- SocialToken.createEmptyVault(), to: Controller.allSocialTokens[tokenId]!.tokenResourceStoragePath) - acct.save(<- SocialToken.createNewMinter(), to: /storage/NMinter) - acct.save(<- SocialToken.createNewBurner(), to: /storage/NBurner) - acct.link<&SocialToken.Burner{SocialToken.BurnerPublic}>(/public/NBurner, target: /storage/NBurner) - acct.link<& SocialToken.Minter{SocialToken.MinterPublic}>(/public/NMinter, target: /storage/NMinter) - acct.link<&SocialToken.Vault{FungibleToken.Balance, SocialToken.SocialTokenPublic, FungibleToken.Receiver}> - (Controller.allSocialTokens[tokenId]!.tokenResourcePublicPath, - target: Controller.allSocialTokens[tokenId]!.tokenResourceStoragePath) - } - - execute { - - log("done") - } -} diff --git a/transactions/setup_social_vault_5.cdc b/transactions/setup_social_vault_5.cdc deleted file mode 100644 index f50779f..0000000 --- a/transactions/setup_social_vault_5.cdc +++ /dev/null @@ -1,21 +0,0 @@ -import FungibleToken from 0xee82856bf20e2aa6 -import SocialToken from "../contracts/SocialToken.cdc" - - -transaction () { - - prepare(acct: AuthAccount) { - acct.save(<- SocialToken.createEmptyVault(), to: /storage/S_0x5) - acct.save(<- SocialToken.createNewMinter(), to: /storage/Minter) - acct.save(<- SocialToken.createNewBurner(), to: /storage/RBurner) - acct.link<&SocialToken.Burner{SocialToken.BurnerPublic}>(/public/RBurner, target: /storage/RBurner) - acct.link<& SocialToken.Minter{SocialToken.MinterPublic}>(/public/Minter, target: /storage/Minter) - acct.link<&SocialToken.Vault{FungibleToken.Balance,SocialToken.SocialTokenPublic, FungibleToken.Receiver}> - (/public/S_0x5, - target: /storage/S_0x5) - } - - execute { - log("done") - } -} \ No newline at end of file diff --git a/transactions/setup_social_vault_6.cdc b/transactions/setup_social_vault_6.cdc deleted file mode 100644 index 73c34c8..0000000 --- a/transactions/setup_social_vault_6.cdc +++ /dev/null @@ -1,22 +0,0 @@ -import FungibleToken from "../contracts/FungibleToken.cdc" -import SocialToken from "../contracts/SocialToken.cdc" - - -transaction () { - - prepare(acct: AuthAccount) { - - acct.save(<- SocialToken.createEmptyVault(), to: /storage/N_0x6) - acct.save(<- SocialToken.createNewMinter(), to: /storage/NMinter) - acct.save(<- SocialToken.createNewBurner(), to: /storage/NBurner) - acct.link<&SocialToken.Burner{SocialToken.BurnerPublic}>(/public/NBurner, target: /storage/NBurner) - acct.link<& SocialToken.Minter{SocialToken.MinterPublic}>(/public/NMinter, target: /storage/NMinter) - acct.link<&SocialToken.Vault{FungibleToken.Balance,SocialToken.SocialTokenPublic, FungibleToken.Receiver}> - (/public/N_0x6, - target: /storage/N_0x6) - } - - execute { - log("done") - } -} \ No newline at end of file diff --git a/transactions/transfer_token_7.cdc b/transactions/transfer_token_7.cdc deleted file mode 100644 index 0269ed9..0000000 --- a/transactions/transfer_token_7.cdc +++ /dev/null @@ -1,31 +0,0 @@ -// This transaction is a template for a transaction that -// could be used by anyone to send tokens to another account -// that has been set up to receive tokens. -// -// The withdraw amount and the account from getAccount -// would be the parameters to the transaction -import FungibleToken from "../contracts/FungibleToken.cdc" -import SocialToken from "../contracts/SocialToken.cdc" - - -transaction(amount: UFix64,to:Address) { - // The Vault resource that holds the tokens that are being transferred - let sentVault: @FungibleToken.Vault - prepare(signer: AuthAccount) { - // Get a reference to the signer's stored vault - let vaultRef = signer.borrow<&SocialToken.Vault>(from: /storage/S_0x5) - ?? panic("Could not borrow reference to the owner's Vault!") - // Withdraw tokens from the signer's stored vault - self.sentVault <- vaultRef.withdraw(amount: amount) - } - - execute { - - let receiverRef = getAccount(to) - .getCapability(/public/S_0x5) - .borrow<&{FungibleToken.Receiver}>() - ?? panic("Could not borrow receiver reference to the recipient's Vault") - // Deposit the withdrawn tokens in the recipient's receiver - receiverRef.deposit(from: <-self.sentVault) - } -} \ No newline at end of file diff --git a/transactions/transfer_token_8.cdc b/transactions/transfer_token_8.cdc deleted file mode 100644 index 80058de..0000000 --- a/transactions/transfer_token_8.cdc +++ /dev/null @@ -1,33 +0,0 @@ -// This transaction is a template for a transaction that -// could be used by anyone to send tokens to another account -// that has been set up to receive tokens. -// -// The withdraw amount and the account from getAccount -// would be the parameters to the transaction -import FungibleToken from "../contracts/FungibleToken.cdc" -import SocialToken from "../contracts/SocialToken.cdc" - - - -transaction(amount: UFix64,to:Address) { - // The Vault resource that holds the tokens that are being transferred - let sentVault: @FungibleToken.Vault - prepare(signer: AuthAccount) { - // Get a reference to the signer's stored vault - let vaultRef = signer.borrow<&SocialToken.Vault>(from: /storage/N_0x6) - ?? panic("Could not borrow reference to the owner's Vault!") - // Withdraw tokens from the signer's stored vault - self.sentVault <- vaultRef.withdraw(amount: amount) - } - execute { - // Get a reference to the recipient's Receiver - let receiverRef = getAccount(to) - .getCapability(/public/N_0x6) - .borrow<&{FungibleToken.Receiver}>() - ?? panic("Could not borrow receiver reference to the recipient's Vault") - // Deposit the withdrawn tokens in the recipient's receiver - receiverRef.deposit(from: <-self.sentVault) - log("succesfuly deposited") - - } -} \ No newline at end of file