Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
QSI_Groupe1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lydia Tarmelit
QSI_Groupe1
Commits
0065edd1
Commit
0065edd1
authored
1 year ago
by
Joe El hajj
Browse files
Options
Downloads
Patches
Plain Diff
Update AssociationRegistry.jsligo
parent
c61ea560
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
contracts/AssociationRegistry.jsligo
+79
-73
79 additions, 73 deletions
contracts/AssociationRegistry.jsligo
with
79 additions
and
73 deletions
contracts/AssociationRegistry.jsligo
+
79
−
73
View file @
0065edd1
...
@@ -3,7 +3,7 @@ type coordinate = {
...
@@ -3,7 +3,7 @@ type coordinate = {
x: int;
x: int;
y: int;
y: int;
z: int;
z: int;
}
;
}
type associationStatus =
type associationStatus =
| ["Active"]
| ["Active"]
...
@@ -25,7 +25,7 @@ type return_ = [list<operation>, storage];
...
@@ -25,7 +25,7 @@ type return_ = [list<operation>, storage];
const registrationFeeInitial: tez = 10 as tez;
const registrationFeeInitial: tez = 10 as tez;
//Register a new DAO
@entry
@entry
function registerAssociation(newAssociation: association, storage: storage): return_ {
function registerAssociation(newAssociation: association, storage: storage): return_ {
const existingAssociation = Big_map.find_opt(newAssociation.name, storage);
const existingAssociation = Big_map.find_opt(newAssociation.name, storage);
...
@@ -37,21 +37,26 @@ function registerAssociation(newAssociation: association, storage: storage): ret
...
@@ -37,21 +37,26 @@ function registerAssociation(newAssociation: association, storage: storage): ret
registrationFee: registrationFeeInitial
registrationFee: registrationFeeInitial
}, storage);
}, storage);
const noOperations: list<operation> = [];
// Within the registerAssociation function
const noOperations : list<operation> = list([]);
const result: return_ = [noOperations, updatedStorage];
const result: return_ = [noOperations, updatedStorage];
return result;
return result;
}
}
//Change Admin
@entry
@entry
function changeAdmin(associationName
: string
, newAdmin
: address, storage: storage): return_
{
function changeAdmin(associationName, newAdmin
, storage)
{
const associationOpt = Big_map.find_opt(associationName, storage);
const associationOpt = Big_map.find_opt(associationName, storage);
if (Option.is_none(associationOpt)) {
if (Option.is_none(associationOpt)) {
failwith("Unknown association cannot change admin");
failwith("Unknown association cannot change admin");
}
}
let association = Option.get(associationOpt);
if (Option.is_none(association.admin) || Tezos.sender != Option.get(association.admin)) {
const association = Option.unopt(associationOpt, () => failwith("Failed to get association"));
//todo
if (Some(Tezos.get_sender()) != association.admin) {
failwith("Only the current admin can change the admin");
failwith("Only the current admin can change the admin");
}
}
...
@@ -59,14 +64,15 @@ function changeAdmin(associationName: string, newAdmin: address, storage: storag
...
@@ -59,14 +64,15 @@ function changeAdmin(associationName: string, newAdmin: address, storage: storag
...association,
...association,
admin: Some(newAdmin)
admin: Some(newAdmin)
};
};
const updatedStorage: storage = Big_map.update(associationName, Some(updatedAssociation), storage);
const updatedStorage = Big_map.update(associationName, Some(updatedAssociation), storage);
const noOperations: list<operation> = [];
const noOperations: list<operation> = [];
const result: return_ = [noOperations, updatedStorage];
const result: return_ = [noOperations, updatedStorage];
return result;
return result;
}
}
//List associations
@view
@view
function getAssociationDetails(associationName: string, storage: storage): option<association> {
function getAssociationDetails(associationName: string, storage: storage): option<association> {
return Big_map.find_opt(associationName, storage);
return Big_map.find_opt(associationName, storage);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment