maxFeeChanged;
+
+ // endregion events
+ // region authorization
+
+ private static void checkOwner() {
+ if (!Runtime.checkWitness(owner())) {
+ abort("unauthorized");
+ }
+ }
+
+ // endregion authorization
+ // region verify
+
+ @OnVerification
+ public static boolean verify() {
+ // This contract is not intended to hold any tokens in between two transactions. In each transaction where
+ // tokens are received, they are intended to be forwarded immediately.
+ return true;
+ }
+
+ // endregion verify
+ // region bridge function
+
+ /**
+ * Deposits the amount of the token to a beneficiary on Neo X. This contract must hold exactly the specified
+ * amount of tokens when this function is called. If the contract holds any tokens after the bridge deposit, the
+ * transaction will be aborted.
+ *
+ * The contract's GAS balance is an exception to this rule since the deposit fee might differ based on the token
+ * or might change during a proposal's lifetime. Therefore, this contrac's {@code maxFee} value is used as
+ * upperbound of how many GAS tokens may still be held by this contract after the bridge deposit. The {@code
+ * maxFee} value can be fetched with {@link GrantSharesBridgeAdapter#maxFee()}.
+ *
+ * The bridge fee will be paid by the treasury using a separate intent.
+ *
+ * @param token the token to bridge.
+ * @param to the recipient of the bridged tokens.
+ * @param amount the amount of tokens to bridge.
+ */
+ public static void bridge(Hash160 token, Hash160 to, Integer amount) {
+ if (!getCallingScriptHash().equals(grantSharesGovContract())) {
+ abort("only GrantSharesGov contract");
+ }
+ if (token == null || !Hash160.isValid(token) || token.isZero()) {
+ abort("invalid token");
+ }
+ if (to == null || !Hash160.isValid(to) || to.isZero()) {
+ abort("invalid to");
+ }
+ if (amount == null || amount <= 0) {
+ abort("invalid amount");
+ }
+
+ Hash160 executingScriptHash = getExecutingScriptHash();
+ BridgeContract bridgeContract = new BridgeContract(bridgeContract());
+ GasToken gasToken = new GasToken();
+ int gasBalanceSelf = gasToken.balanceOf(executingScriptHash);
+ int maxFee = maxFee();
+
+ if (token.equals(gasToken.getHash())) {
+ if (gasBalanceSelf < amount + bridgeContract.nativeDepositFee()) {
+ abort("insufficient gas balance for bridge deposit");
+ }
+ bridgeContract.depositNative(executingScriptHash, to, amount, maxFee);
+ } else if (token.equals(new NeoToken().getHash())) {
+ if (gasBalanceSelf < bridgeContract.tokenDepositFee(token)) {
+ abort("insufficient gas balance for bridge fee");
+ }
+ if (new FungibleToken(token).balanceOf(executingScriptHash) < amount) {
+ abort("insufficient token balance for bridge deposit");
+ }
+ bridgeContract.depositToken(token, executingScriptHash, to, amount, maxFee);
+ // Checks that this contract holds no tokens after the deposit. Aborts if it still holds any tokens.
+ checkTokenBalance(new FungibleToken(token), executingScriptHash, 0);
+ } else {
+ abort("unsupported token");
+ }
+ // Checks that this contract holds maximally the maxFee after the deposit. Aborts if it holds more GAS.
+ checkTokenBalance(gasToken, executingScriptHash, maxFee);
+ }
+
+ private static void checkTokenBalance(FungibleToken token, Hash160 account, int maxAllowed) {
+ if (token.balanceOf(account) > maxAllowed) {
+ abort("unallowed token balance remainder");
+ }
+ }
+
+ // endregion bridge function
+ // region NEP17 payment
+
+ /**
+ * This contract accepts the following NEP-17 payments:
+ *
+ * GAS and NEO from the GrantShares treasury
+ * GAS from the whitelisted funder
+ * Minted GAS in the unplanned event of this contract holding NEO
+ *
+ *
+ * Provided data is ignored.
+ *
+ * @param from the sender of tokens.
+ * @param amount the amount sent.
+ * @param data abritrary data.
+ */
+ @OnNEP17Payment
+ public static void onNEP17Payment(Hash160 from, int amount, Object data) {
+ Hash160 callingScriptHash = Runtime.getCallingScriptHash();
+
+ if (callingScriptHash.equals(new GasToken().getHash())) {
+ if (from == null) { // Allow Gas minting from potentially holding Neo.
+ return;
+ } else if (from.equals(grantSharesTrasuryContract()) || from.equals(whitelistedFunder())) {
+ return;
+ } else {
+ abort("only treasury or whitelisted funder");
+ }
+ } else if (callingScriptHash.equals(new NeoToken().getHash())) {
+ if (from.equals(grantSharesTrasuryContract())) {
+ return;
+ } else {
+ abort("only treasury");
+ }
+ } else {
+ abort("unsupported token");
+ }
+ }
+
+ // endregion
+ // region setters
+
+ /**
+ * Sets the whitelisted funder that is allowed to send GAS to this contract.
+ *
+ * @param funder the new whitelisted funder.
+ */
+ public static void setWhitelistedFunder(Hash160 funder) {
+ checkOwner();
+ if (funder == null || !Hash160.isValid(funder) || funder.isZero()) {
+ abort("invalid funder");
+ }
+ Storage.put(context, WHITELISTED_FUNDER_KEY, funder);
+ whitelistedFunderAdded.fire(funder);
+ }
+
+ /**
+ * Sets the {@code maxFee} that is used as parameter to the bridge's deposit interface.
+ *
+ * @param maxFee the max fee used for bridge deposits.
+ */
+ public static void setMaxFee(Integer maxFee) {
+ checkOwner();
+ if (maxFee == null || maxFee < 0) {
+ abort("invalid max fee");
+ }
+ Storage.put(context, MAX_FEE_KEY, maxFee);
+ maxFeeChanged.fire(maxFee);
+ }
+
+ // endregion setters
+ // region read-only methods
+
+ @Safe
+ public static Hash160 owner() {
+ return Storage.getHash160(context.asReadOnly(), OWNER_KEY);
+ }
+
+ /**
+ * @return the max fee that is used for all the bridge's token deposit functions.
+ */
+ @Safe
+ public static int maxFee() {
+ return Storage.getInt(context.asReadOnly(), MAX_FEE_KEY);
+ }
+
+ /**
+ * @return the funder that is allowed to send GAS to this contract.
+ */
+ @Safe
+ public static Hash160 whitelistedFunder() {
+ return Storage.getHash160(context.asReadOnly(), WHITELISTED_FUNDER_KEY);
+ }
+
+ @Safe
+ public static Hash160 grantSharesGovContract() {
+ return Storage.getHash160(context.asReadOnly(), GRANTSHARESGOV_CONTRACT_KEY);
+ }
+
+ @Safe
+ public static Hash160 grantSharesTrasuryContract() {
+ return Storage.getHash160(context.asReadOnly(), GRANTSHARESTREASURY_CONTRACT_KEY);
+ }
+
+ @Safe
+ public static Hash160 bridgeContract() {
+ return Storage.getHash160(context.asReadOnly(), BRIDGE_CONTRACT_KEY);
+ }
+
+ // endregion
+ // region deployment/update
+
+ @Struct
+ static class DeployData {
+ Hash160 initialOwner;
+ Hash160 grantSharesGovContract;
+ Hash160 grantSharesTreasuryContract;
+ Hash160 bridgeContract;
+ Integer initialMaxFee;
+ Hash160 initialWhitelistedFunder;
+ }
+
+ @OnDeployment
+ public static void deploy(Object data, boolean update) {
+ if (update) {
+ if (Storage.getInt(context.asReadOnly(), VERSION_KEY) != 1) {
+ abort("invalid version");
+ }
+ Storage.put(context, VERSION_KEY, 2);
+ Storage.delete(context, V1_BRIDGE_VERSION_KEY);
+ } else {
+ Storage.put(context, VERSION_KEY, 1);
+
+ // Initialize the contract.
+ DeployData deployData = (DeployData) data;
+ Hash160 initialOwner = deployData.initialOwner;
+ if (initialOwner == null || !Hash160.isValid(initialOwner) || initialOwner.isZero()) {
+ abort("invalid initial owner");
+ }
+ Storage.put(context, OWNER_KEY, initialOwner);
+
+ Hash160 gsGovContract = deployData.grantSharesGovContract;
+ if (gsGovContract == null || !Hash160.isValid(gsGovContract) || gsGovContract.isZero()) {
+ abort("invalid GrantSharesGov contract");
+ }
+ Storage.put(context, GRANTSHARESGOV_CONTRACT_KEY, gsGovContract);
+
+ Hash160 gsTreasury = deployData.grantSharesTreasuryContract;
+ if (gsGovContract == null || !Hash160.isValid(gsTreasury) || gsTreasury.isZero()) {
+ abort("invalid GrantSharesTreasury contract");
+ }
+ Storage.put(context, GRANTSHARESTREASURY_CONTRACT_KEY, gsTreasury);
+
+ Hash160 bridgeContract = deployData.bridgeContract;
+ if (bridgeContract == null || !Hash160.isValid(bridgeContract) || bridgeContract.isZero()) {
+ abort("invalid bridge contract");
+ }
+ Storage.put(context, BRIDGE_CONTRACT_KEY, bridgeContract);
+
+ Integer initialMaxFee = deployData.initialMaxFee;
+ if (initialMaxFee == null || initialMaxFee < 0) {
+ abort("invalid initial max fee");
+ }
+ Storage.put(context, MAX_FEE_KEY, initialMaxFee);
+
+ Hash160 whitelistedFunder = deployData.initialWhitelistedFunder;
+ if (whitelistedFunder == null || !Hash160.isValid(whitelistedFunder) || whitelistedFunder.isZero()) {
+ abort("invalid whitelisted funder");
+ }
+ Storage.put(context, WHITELISTED_FUNDER_KEY, whitelistedFunder);
+ }
+ }
+
+ public static void update(ByteString nef, String manifest, Object data) {
+ checkOwner();
+ new ContractManagement().update(nef, manifest, data);
+ }
+
+ // endregion deployment/update
+ // region bridge interface
+
+ /**
+ * The bridge contract interface.
+ *
+ * The interface only includes the deposit and fee functions for version 3 of the bridge.
+ *
+ * If there is a new bridge version in the future with changes to the below interface, this contract will need to
+ * be updated.
+ */
+ static class BridgeContract extends ContractInterface {
+ BridgeContract(Hash160 contractHash) {
+ super(contractHash);
+ }
+
+ @CallFlags(io.neow3j.devpack.constants.CallFlags.All)
+ native void depositNative(Hash160 from, Hash160 to, int amount, int maxFee);
+
+ @CallFlags(io.neow3j.devpack.constants.CallFlags.All)
+ native void depositToken(Hash160 neoN3Token, Hash160 from, Hash160 to, int amount, int maxFee);
+
+ @CallFlags(io.neow3j.devpack.constants.CallFlags.ReadStates | io.neow3j.devpack.constants.CallFlags.AllowCall)
+ native int nativeDepositFee();
+
+ @CallFlags(io.neow3j.devpack.constants.CallFlags.ReadStates | io.neow3j.devpack.constants.CallFlags.AllowCall)
+ native int tokenDepositFee(Hash160 token);
+ }
+
+ // endregion
+
+}
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
index f48fe36..6e144a1 100644
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
+++ b/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java
@@ -7,10 +7,10 @@
import io.neow3j.devpack.Hash160;
import io.neow3j.devpack.Helper;
import io.neow3j.devpack.Iterator;
-import io.neow3j.devpack.Iterator.Struct;
import io.neow3j.devpack.List;
import io.neow3j.devpack.Map;
import io.neow3j.devpack.Runtime;
+import io.neow3j.devpack.Iterator.Struct;
import io.neow3j.devpack.Storage;
import io.neow3j.devpack.StorageContext;
import io.neow3j.devpack.StorageMap;
@@ -20,29 +20,25 @@
import io.neow3j.devpack.annotations.OnDeployment;
import io.neow3j.devpack.annotations.Permission;
import io.neow3j.devpack.annotations.Safe;
-import io.neow3j.devpack.constants.CallFlags;
import io.neow3j.devpack.constants.FindOptions;
import io.neow3j.devpack.contracts.ContractManagement;
-import io.neow3j.devpack.events.Event;
-import io.neow3j.devpack.events.Event1Arg;
-import io.neow3j.devpack.events.Event2Args;
-import io.neow3j.devpack.events.Event3Args;
-import io.neow3j.devpack.events.Event4Args;
+import io.neow3j.devpack.contracts.StdLib;
+import io.neow3j.devpack.events.*;
import static io.neow3j.devpack.Account.createStandardAccount;
import static io.neow3j.devpack.Runtime.checkWitness;
import static io.neow3j.devpack.Runtime.getTime;
import static io.neow3j.devpack.Storage.getReadOnlyContext;
import static io.neow3j.devpack.constants.FindOptions.ValuesOnly;
-import static io.neow3j.devpack.contracts.StdLib.deserialize;
-import static io.neow3j.devpack.contracts.StdLib.serialize;
@Permission(contract = "*", methods = "*")
@ManifestExtra(key = "Author", value = "AxLabs")
@ManifestExtra(key = "Email", value = "info@grantshares.io")
@ManifestExtra(key = "Description", value = "The governing contract of the GrantShares DAO")
@ManifestExtra(key = "Website", value = "https://grantshares.io")
+//@formatter:off
@ContractSourceCode("https://github.com/AxLabs/grantshares-contracts/blob/main/src/main/java/com/axlabs/neo/grantshares/GrantSharesGov.java")
+//@formatter:on
@DisplayName("GrantSharesGov")
@SuppressWarnings("unchecked")
public class GrantSharesGov {
@@ -94,8 +90,6 @@ public class GrantSharesGov {
static Event unpaused;
@DisplayName("ProposalMigrated")
static Event1Arg migrated;
- @DisplayName("Error")
- static Event2Args error;
//endregion EVENTS
/**
@@ -145,29 +139,21 @@ public static void deploy(Object data, boolean update) {
Storage.put(ctx, PAUSED_KEY, 0);
Storage.put(ctx, PROPOSALS_COUNT_KEY, 0);
} else {
- // Migrate Storage
- Iterator> it = proposalData.find(FindOptions.RemovePrefix);
- while (it.next()) {
- Struct item = it.get();
- int proposalId = item.key.toInt();
- ProposalDataOld pd = (ProposalDataOld) deserialize(item.value);
- List newIntents = new List<>();
- for (IntentOld intent : pd.intents) {
- newIntents.add(new Intent(intent.targetContract, intent.method, intent.params, CallFlags.All));
+ int proposalsCount = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
+ int memberCount = Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY);
+ StdLib stdLib = new StdLib();
+ for (int i = 0; i < proposalsCount; i++) {
+ ProposalData proposalData = (ProposalData) stdLib.deserialize(GrantSharesGov.proposalData.get(i));
+ ProposalV1 proposalV1 = (ProposalV1) stdLib.deserialize(GrantSharesGov.proposals.get(i));
+ // The quorum vote is calculated and set for proposals that have been endorsed and are still active,
+ // i.e., not executed nor expired. Otherwise, a proposal's quorum is set to 0. For already executed or
+ // expired proposals, this value is irrelevant. For proposals that haven't been endorsed yet, the
+ // value will be calculated and set upon endorsement.
+ ProposalV2 proposalV2 = new ProposalV2(proposalV1);
+ if (proposalV2.endorser != null && proposalV2.expiration >= getTime() && !proposalV2.executed) {
+ proposalV2.calculateAndSetQuorumVotes(proposalData.quorum, memberCount);
}
- ProposalData pdn = new ProposalData(pd.proposer, pd.linkedProposal, pd.acceptanceRate,
- pd.quorum, newIntents.toArray(), pd.offchainUri);
- proposalData.put(proposalId, serialize(pdn));
- migrated.fire(proposalId);
- }
-
- // Set parameters
- List params = (List) data;
- for (int i = 0; i < params.size(); i += 2) {
- String paramKey = (String) params.get(i);
- int value = (int) params.get(i + 1);
- abortOnInvalidValue(paramKey, value);
- parameters.put(paramKey, value);
+ proposals.put(i, stdLib.serialize(proposalV2));
}
}
}
@@ -211,7 +197,7 @@ public static ProposalDTO getProposal(int id) {
dto.id = id;
ByteString bytes = proposalData.get(id);
if (bytes != null) {
- ProposalData p = (ProposalData) deserialize(bytes);
+ ProposalData p = (ProposalData) new StdLib().deserialize(bytes);
dto.proposer = p.proposer;
dto.linkedProposal = p.linkedProposal;
dto.acceptanceRate = p.acceptanceRate;
@@ -223,8 +209,9 @@ public static ProposalDTO getProposal(int id) {
}
bytes = proposals.get(id);
if (bytes != null) {
- Proposal p = (Proposal) deserialize(bytes);
+ ProposalV2 p = (ProposalV2) new StdLib().deserialize(bytes);
dto.endorser = p.endorser;
+ dto.quorumVotes = p.quorumVotes;
dto.reviewEnd = p.reviewEnd;
dto.votingEnd = p.votingEnd;
dto.queuedEnd = p.timeLockEnd;
@@ -233,7 +220,7 @@ public static ProposalDTO getProposal(int id) {
}
bytes = proposalVotes.get(id);
if (bytes != null) {
- ProposalVotes p = (ProposalVotes) deserialize(bytes);
+ ProposalVotes p = (ProposalVotes) new StdLib().deserialize(bytes);
dto.approve = p.approve;
dto.reject = p.reject;
dto.abstain = p.abstain;
@@ -289,10 +276,8 @@ public static int getProposalCount() {
*/
@Safe
public static Paginator.Paginated getProposals(int page, int itemsPerPage) throws Exception {
- if (page < 0)
- throw new Exception("[GrantSharesGov.getProposals] Page number was negative");
- if (itemsPerPage <= 0)
- throw new Exception("[GrantSharesGov.getProposals] Page number was negative or zero");
+ if (page < 0) throw new Exception("[GrantSharesGov.getProposals] Page number was negative");
+ if (itemsPerPage <= 0) throw new Exception("[GrantSharesGov.getProposals] Page number was negative or zero");
int n = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
int[] pagination = Paginator.calcPagination(n, page, itemsPerPage);
List list = new List<>();
@@ -340,8 +325,9 @@ public static int calcMembersMultiSigAccountThreshold() throws Exception {
if (thresholdTimes100 % 100 != 0) {
threshold += 1; // Always round up.
}
- if (threshold == 0)
+ if (threshold == 0) {
throw new Exception("[GrantSharesGov.calcMembersMultiSigAccountThreshold] Threshold was zero");
+ }
return threshold;
}
@@ -359,8 +345,8 @@ public static int calcMembersMultiSigAccountThreshold() throws Exception {
*/
public static int createProposal(Hash160 proposer, Intent[] intents, String offchainUri, int linkedProposal) {
return createProposal(proposer, intents, offchainUri, linkedProposal,
- parameters.getInt(MIN_ACCEPTANCE_RATE_KEY),
- parameters.getInt(MIN_QUORUM_KEY));
+ parameters.getInt(MIN_ACCEPTANCE_RATE_KEY), parameters.getInt(MIN_QUORUM_KEY)
+ );
}
/**
@@ -377,21 +363,26 @@ public static int createProposal(Hash160 proposer, Intent[] intents, String offc
public static int createProposal(Hash160 proposer, Intent[] intents, String offchainUri, int linkedProposal,
int acceptanceRate, int quorum) {
- if (!checkWitness(proposer)) fireErrorAndAbort("Not authorised", "createProposal");
- if (acceptanceRate < parameters.getInt(MIN_ACCEPTANCE_RATE_KEY) || acceptanceRate > 100)
- fireErrorAndAbort("Invalid acceptance rate", "createProposal");
- if (quorum < parameters.getInt(MIN_QUORUM_KEY) || quorum > 100)
- fireErrorAndAbort("Invalid quorum", "createProposal");
- if (linkedProposal >= 0 && proposals.get(linkedProposal) == null)
- fireErrorAndAbort("Linked proposal doesn't exist", "createProposal");
- if (!areIntentsValid(intents)) fireErrorAndAbort("Invalid intents", "createProposal");
+ if (!checkWitness(proposer)) Helper.abort("createProposal" + ": " + "Not authorised");
+ if (acceptanceRate < parameters.getInt(MIN_ACCEPTANCE_RATE_KEY) || acceptanceRate > 100) {
+ Helper.abort("createProposal" + ": " + "Invalid acceptance rate");
+ }
+ if (quorum < parameters.getInt(MIN_QUORUM_KEY) || quorum > 100) {
+ Helper.abort("createProposal" + ": " + "Invalid quorum");
+ }
+ if (linkedProposal >= 0 && proposals.get(linkedProposal) == null) {
+ Helper.abort("createProposal" + ": " + "Linked proposal doesn't exist");
+ }
+ if (!areIntentsValid(intents)) Helper.abort("createProposal" + ": " + "Invalid intents");
int id = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
int expiration = parameters.getInt(EXPIRATION_LENGTH_KEY) + getTime();
- proposals.put(id, serialize(new Proposal(id, expiration)));
- proposalData.put(id, serialize(new ProposalData(proposer, linkedProposal, acceptanceRate,
- quorum, intents, offchainUri)));
- proposalVotes.put(id, serialize(new ProposalVotes()));
+ StdLib stdLib = new StdLib();
+ proposals.put(id, stdLib.serialize(new ProposalV2(id, expiration)));
+ proposalData.put(id, stdLib.serialize(
+ new ProposalData(proposer, linkedProposal, acceptanceRate, quorum, intents, offchainUri))
+ );
+ proposalVotes.put(id, stdLib.serialize(new ProposalVotes()));
Storage.put(ctx, PROPOSALS_COUNT_KEY, id + 1);
// An event can take max 1024 bytes data. Thus, we're not passing the offchainUri since it could be longer.
@@ -403,7 +394,7 @@ private static boolean areIntentsValid(Intent[] intents) {
for (Intent intent : intents) {
if (!Hash160.isValid(intent.targetContract) ||
intent.targetContract == Hash160.zero() ||
- intent.targetContract == ContractManagement.getHash() ||
+ intent.targetContract == new ContractManagement().getHash() ||
intent.method == null ||
intent.method == "" ||
!Helper.within(intent.callFlags, 1, 256)
@@ -423,20 +414,27 @@ private static boolean areIntentsValid(Intent[] intents) {
*/
public static void endorseProposal(int id, Hash160 endorser) {
abortIfPaused();
- if (members.get(endorser.toByteString()) == null || !checkWitness(endorser))
- fireErrorAndAbort("Not authorised", "endorseProposal");
+ if (members.get(endorser.toByteString()) == null || !checkWitness(endorser)) {
+ Helper.abort("endorseProposal" + ": " + "Not authorised");
+ }
+
ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null) fireErrorAndAbort("Proposal doesn't exist", "endorseProposal");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
- if (proposal.expiration <= getTime()) fireErrorAndAbort("Proposal expired", "endorseProposal");
- if (proposal.endorser != null) fireErrorAndAbort("Proposal already endorsed", "endorseProposal");
+ if (proposalBytes == null) Helper.abort("endorseProposal" + ": " + "Proposal doesn't exist");
+ StdLib stdLib = new StdLib();
+ ProposalV2 proposal = (ProposalV2) stdLib.deserialize(proposalBytes);
+ if (proposal.expiration <= getTime()) Helper.abort("endorseProposal" + ": " + "Proposal expired");
+ if (proposal.endorser != null) Helper.abort("endorseProposal" + ": " + "Proposal already endorsed");
+
+ ProposalData proposalData = (ProposalData) stdLib.deserialize(GrantSharesGov.proposalData.get(id));
proposal.endorser = endorser;
+ proposal.calculateAndSetQuorumVotes(proposalData.quorum, getMembersCount());
proposal.reviewEnd = getTime() + parameters.getInt(REVIEW_LENGTH_KEY);
proposal.votingEnd = proposal.reviewEnd + parameters.getInt(VOTING_LENGTH_KEY);
proposal.timeLockEnd = proposal.votingEnd + parameters.getInt(TIMELOCK_LENGTH_KEY);
proposal.expiration = proposal.timeLockEnd + parameters.getInt(EXPIRATION_LENGTH_KEY);
- proposals.put(id, serialize(proposal));
+ proposals.put(id, stdLib.serialize(proposal));
+
endorsed.fire(id, endorser);
}
@@ -451,17 +449,19 @@ public static void endorseProposal(int id, Hash160 endorser) {
*/
public static void vote(int id, int vote, Hash160 voter) {
abortIfPaused();
- if (vote < -1 || vote > 1) fireErrorAndAbort("Invalid vote", "vote");
- if (members.get(voter.toByteString()) == null || !checkWitness(voter))
- fireErrorAndAbort("Not authorised", "vote");
+ if (vote < -1 || vote > 1) Helper.abort("vote" + ": " + "Invalid vote");
+ if (members.get(voter.toByteString()) == null || !checkWitness(voter)) {
+ Helper.abort("vote" + ": " + "Not authorised");
+ }
ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null) fireErrorAndAbort("Proposal doesn't exist", "vote");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
+ if (proposalBytes == null) Helper.abort("vote" + ": " + "Proposal doesn't exist");
+ ProposalV2 proposal = (ProposalV2) new StdLib().deserialize(proposalBytes);
int time = getTime();
- if (proposal.endorser == null || time < proposal.reviewEnd || time >= proposal.votingEnd)
- fireErrorAndAbort("Proposal not active", "vote");
- ProposalVotes pv = (ProposalVotes) deserialize(proposalVotes.get(id));
- if (pv.voters.containsKey(voter)) fireErrorAndAbort("Already voted on this proposal", "vote");
+ if (proposal.endorser == null || time < proposal.reviewEnd || time >= proposal.votingEnd) {
+ Helper.abort("vote" + ": " + "Proposal not active");
+ }
+ ProposalVotes pv = (ProposalVotes) new StdLib().deserialize(proposalVotes.get(id));
+ if (pv.voters.containsKey(voter)) Helper.abort("vote" + ": " + "Already voted on this proposal");
pv.voters.put(voter, vote);
if (vote < 0) {
@@ -471,7 +471,7 @@ public static void vote(int id, int vote, Hash160 voter) {
} else {
pv.abstain += 1;
}
- proposalVotes.put(id, serialize(pv));
+ proposalVotes.put(id, new StdLib().serialize(pv));
voted.fire(id, voter, vote);
}
@@ -487,24 +487,27 @@ public static void vote(int id, int vote, Hash160 voter) {
public static Object[] execute(int id) {
abortIfPaused();
ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null) fireErrorAndAbort("Proposal doesn't exist", "execute");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
- if (proposal.endorser == null || getTime() < proposal.timeLockEnd)
- fireErrorAndAbort("Proposal not in execution phase", "execute");
- if (proposal.executed) fireErrorAndAbort("Proposal already executed", "execute");
- if (proposal.expiration <= getTime()) fireErrorAndAbort("Proposal expired", "execute");
- ProposalData data = (ProposalData) deserialize(proposalData.get(id));
- ProposalVotes votes = (ProposalVotes) deserialize(proposalVotes.get(id));
+ if (proposalBytes == null) Helper.abort("execute" + ": " + "Proposal doesn't exist");
+ ProposalV2 proposal = (ProposalV2) new StdLib().deserialize(proposalBytes);
+ if (proposal.endorser == null || getTime() < proposal.timeLockEnd) {
+ Helper.abort("execute" + ": " + "Proposal not in execution phase");
+ }
+ if (proposal.executed) Helper.abort("execute" + ": " + "Proposal already executed");
+ if (proposal.expiration <= getTime()) Helper.abort("execute" + ": " + "Proposal expired");
+ ProposalData data = (ProposalData) new StdLib().deserialize(proposalData.get(id));
+ ProposalVotes votes = (ProposalVotes) new StdLib().deserialize(proposalVotes.get(id));
int voteCount = votes.approve + votes.abstain + votes.reject;
- if (voteCount * 100 / Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) < data.quorum)
- fireErrorAndAbort("Quorum not reached", "execute");
+ if (voteCount < proposal.quorumVotes) {
+ Helper.abort("execute" + ": " + "Quorum not reached");
+ }
int yesNoCount = votes.approve + votes.reject;
- if (yesNoCount == 0 || (votes.approve * 100 / yesNoCount <= data.acceptanceRate))
- fireErrorAndAbort("Proposal rejected", "execute");
+ if (yesNoCount == 0 || (votes.approve * 100 / yesNoCount <= data.acceptanceRate)) {
+ Helper.abort("execute" + ": " + "Proposal rejected");
+ }
proposal.executed = true;
Object[] returnVals = new Object[data.intents.length];
- proposals.put(id, serialize(proposal));
+ proposals.put(id, new StdLib().serialize(proposal));
for (int i = 0; i < data.intents.length; i++) {
Intent t = data.intents[i];
returnVals[i] = Contract.call(t.targetContract, t.method, t.callFlags, t.params);
@@ -538,17 +541,17 @@ private static void abortOnInvalidValue(String paramKey, int value) {
case VOTING_LENGTH_KEY:
case TIMELOCK_LENGTH_KEY:
case EXPIRATION_LENGTH_KEY:
- if (value < 0) fireErrorAndAbort("Invalid parameter value", "changeParam");
+ if (value < 0) Helper.abort("changeParam" + ": " + "Invalid parameter value");
break;
case MIN_ACCEPTANCE_RATE_KEY:
case MIN_QUORUM_KEY:
- if (value < 0 || value > 100) fireErrorAndAbort("Invalid parameter value", "changeParam");
+ if (value < 0 || value > 100) Helper.abort("changeParam" + ": " + "Invalid parameter value");
break;
case MULTI_SIG_THRESHOLD_KEY:
- if (value <= 0 || value > 100) fireErrorAndAbort("Invalid parameter value", "changeParam");
+ if (value <= 0 || value > 100) Helper.abort("changeParam" + ": " + "Invalid parameter value");
break;
default:
- fireErrorAndAbort("Unknown parameter", "changeParam");
+ Helper.abort("changeParam" + ": " + "Unknown parameter");
}
}
@@ -563,7 +566,7 @@ public static void addMember(ECPoint memberPubKey) {
abortIfPaused();
abortIfCallerIsNotSelf();
Hash160 memberHash = createStandardAccount(memberPubKey);
- if (members.get(memberHash.toByteString()) != null) fireErrorAndAbort("Already a member", "addMember");
+ if (members.get(memberHash.toByteString()) != null) Helper.abort("addMember" + ": " + "Already a member");
members.put(memberHash.toByteString(), memberPubKey.toByteString());
Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) + 1);
memberAdded.fire(memberHash);
@@ -580,7 +583,7 @@ public static void removeMember(ECPoint memberPubKey) {
abortIfPaused();
abortIfCallerIsNotSelf();
Hash160 memberHash = createStandardAccount(memberPubKey);
- if (members.get(memberHash.toByteString()) == null) fireErrorAndAbort("Not a member", "removeMember");
+ if (members.get(memberHash.toByteString()) == null) Helper.abort("removeMember" + ": " + "Not a member");
members.delete(memberHash.toByteString());
Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) - 1);
memberRemoved.fire(memberHash);
@@ -600,7 +603,7 @@ public static void updateContract(ByteString nef, String manifest, Object data)
abortIfPaused();
abortIfCallerIsNotSelf();
updating.fire();
- ContractManagement.update(nef, manifest, data);
+ new ContractManagement().update(nef, manifest, data);
}
//endregion PROPOSAL-INVOKED METHODS
@@ -609,9 +612,9 @@ public static void pause() {
try {
membersMultiSigHash = calcMembersMultiSigAccount();
} catch (Exception e) {
- fireErrorAndAbort(e.getMessage(), "pause");
+ Helper.abort("pause" + ": " + e.getMessage());
}
- if (!checkWitness(membersMultiSigHash)) fireErrorAndAbort("Not authorized", "pause");
+ if (!checkWitness(membersMultiSigHash)) Helper.abort("pause" + ": " + "Not authorized");
Storage.put(ctx, PAUSED_KEY, 1);
paused.fire();
}
@@ -621,28 +624,22 @@ public static void unpause() {
try {
membersMultiSigHash = calcMembersMultiSigAccount();
} catch (Exception e) {
- fireErrorAndAbort(e.getMessage(), "pause");
+ Helper.abort("pause" + ": " + e.getMessage());
}
- if (!checkWitness(membersMultiSigHash)) fireErrorAndAbort("Not authorized", "unpause");
+ if (!checkWitness(membersMultiSigHash)) Helper.abort("unpause" + ": " + "Not authorized");
Storage.put(ctx, PAUSED_KEY, 0);
unpaused.fire();
}
private static void abortIfCallerIsNotSelf() {
if (Runtime.getCallingScriptHash() != Runtime.getExecutingScriptHash()) {
- fireErrorAndAbort("Method only callable by the contract itself", "abortIfCallerIsNotSelf");
+ Helper.abort("abortIfCallerIsNotSelf" + ": " + "Method only callable by the contract itself");
}
}
public static void abortIfPaused() {
if (Storage.getBoolean(getReadOnlyContext(), PAUSED_KEY)) {
- fireErrorAndAbort("Contract is paused", "abortIfPaused");
+ Helper.abort("abortIfPaused" + ": " + "Contract is paused");
}
}
-
- private static void fireErrorAndAbort(String msg, String method) {
- error.fire(msg, method);
- Helper.abort();
- }
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGovOld.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesGovOld.java
deleted file mode 100644
index 4b36c46..0000000
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesGovOld.java
+++ /dev/null
@@ -1,618 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import io.neow3j.devpack.Account;
-import io.neow3j.devpack.ByteString;
-import io.neow3j.devpack.Contract;
-import io.neow3j.devpack.ECPoint;
-import io.neow3j.devpack.Hash160;
-import io.neow3j.devpack.Iterator;
-import io.neow3j.devpack.Iterator.Struct;
-import io.neow3j.devpack.List;
-import io.neow3j.devpack.Map;
-import io.neow3j.devpack.Runtime;
-import io.neow3j.devpack.Storage;
-import io.neow3j.devpack.StorageContext;
-import io.neow3j.devpack.StorageMap;
-import io.neow3j.devpack.annotations.ContractSourceCode;
-import io.neow3j.devpack.annotations.DisplayName;
-import io.neow3j.devpack.annotations.ManifestExtra;
-import io.neow3j.devpack.annotations.OnDeployment;
-import io.neow3j.devpack.annotations.Permission;
-import io.neow3j.devpack.annotations.Safe;
-import io.neow3j.devpack.constants.CallFlags;
-import io.neow3j.devpack.constants.FindOptions;
-import io.neow3j.devpack.contracts.ContractManagement;
-import io.neow3j.devpack.events.Event;
-import io.neow3j.devpack.events.Event1Arg;
-import io.neow3j.devpack.events.Event2Args;
-import io.neow3j.devpack.events.Event3Args;
-import io.neow3j.devpack.events.Event4Args;
-
-import static io.neow3j.devpack.Account.createStandardAccount;
-import static io.neow3j.devpack.Runtime.checkWitness;
-import static io.neow3j.devpack.Runtime.getTime;
-import static io.neow3j.devpack.Storage.getReadOnlyContext;
-import static io.neow3j.devpack.constants.FindOptions.ValuesOnly;
-import static io.neow3j.devpack.contracts.StdLib.deserialize;
-import static io.neow3j.devpack.contracts.StdLib.serialize;
-
-@Permission(contract = "*", methods = "*")
-@ManifestExtra(key = "Author", value = "AxLabs")
-@ManifestExtra(key = "Email", value = "info@grantshares.io")
-@ManifestExtra(key = "Description", value = "The governing contract of the GrantShares DAO")
-@ManifestExtra(key = "Website", value = "https://grantshares.io")
-@ContractSourceCode("TODO: Set this to the URL of the release branch before deploying.")
-@DisplayName("GrantSharesGov")
-@SuppressWarnings("unchecked")
-public class GrantSharesGovOld {
-
- //region CONTRACT VARIABLES
-
- // Parameter keys
- static final String REVIEW_LENGTH_KEY = "review_len"; // milliseconds
- static final String VOTING_LENGTH_KEY = "voting_len"; // milliseconds
- static final String TIMELOCK_LENGTH_KEY = "timelock_len"; // milliseconds
- static final String EXPIRATION_LENGTH_KEY = "expiration_len"; // milliseconds
- static final String MIN_ACCEPTANCE_RATE_KEY = "min_accept_rate"; // percentage
- static final String MIN_QUORUM_KEY = "min_quorum"; // percentage
- static final String MULTI_SIG_THRESHOLD_KEY = "threshold"; // percentage
-
- static final String PROPOSALS_COUNT_KEY = "#_proposals"; //int
- static final String PAUSED_KEY = "paused"; // boolean
- static final String MEMBERS_COUNT_KEY = "#_members"; // int
-
- static final StorageContext ctx = Storage.getStorageContext();
- static final StorageMap proposals = new StorageMap(ctx, 1); // [int id: Proposal proposal]
- static final StorageMap proposalData = new StorageMap(ctx, 2); // [int id: ProposalData proposalData]
- static final StorageMap proposalVotes = new StorageMap(ctx, 3); // [int id: ProposalVotes proposalVotes]
- static final StorageMap parameters = new StorageMap(ctx, 4); // [String param_key: int param_value ]
- static final byte MEMBERS_MAP_PREFIX = 5;
- static final StorageMap members = new StorageMap(ctx, MEMBERS_MAP_PREFIX); // [Hash160 accHash: ECPoint publicKey]
- //endregion CONTRACT VARIABLES
-
- //region EVENTS
- @DisplayName("ProposalCreated")
- static Event4Args created;
- @DisplayName("ProposalEndorsed")
- static Event2Args endorsed;
- @DisplayName("Voted")
- static Event3Args voted;
- @DisplayName("ProposalExecuted")
- static Event1Arg executed;
- @DisplayName("MemberAdded")
- static Event1Arg memberAdded;
- @DisplayName("MemberRemoved")
- static Event1Arg memberRemoved;
- @DisplayName("ParameterChanged")
- static Event2Args paramChanged;
- @DisplayName("UpdatingContract")
- static Event updating;
- @DisplayName("ContractPaused")
- static Event paused;
- @DisplayName("ContractUnpaused")
- static Event unpaused;
- //endregion EVENTS
-
- /**
- * Initialises this contract on deployment.
- *
- * The data parameter has to be structured as follows:
- *
- * [
- * [
- * ECPoint publicKeyMember1,
- * ECPoint publicKeyMember2,
- * ...
- * ],
- * [
- * String paramName1: int paramValue1,
- * String paramName2: int paramValue2,
- * ...
- * ],
- * ]
- *
- *
- * @param data The data to set up the governance's storage with.
- * @param update Tells if the method is called for updating this contract.
- */
- @OnDeployment
- public static void deploy(Object data, boolean update) throws Exception {
- if (!update) {
- List config = (List) data;
- // Set parameters
- List params = (List) config.get(1);
- for (int i = 0; i < params.size(); i += 2) {
- String paramKey = (String) params.get(i);
- int value = (int) params.get(i + 1);
- throwOnInvalidValue(paramKey, value);
- parameters.put(paramKey, value);
- }
-
- // Set members
- ECPoint[] pubKeys = (ECPoint[]) config.get(0);
- if (pubKeys.length == 0)
- throw new Exception("[GrantSharesGov.deploy] Member list was empty");
- for (ECPoint pubKey : pubKeys) {
- if (!ECPoint.isValid(pubKey))
- throw new Exception("[GrantSharesGov.deploy] Invalid member public key");
- members.put(createStandardAccount(pubKey).toByteString(), pubKey.toByteString());
- }
-
- Storage.put(ctx, MEMBERS_COUNT_KEY, pubKeys.length);
- Storage.put(ctx, PAUSED_KEY, 0);
- Storage.put(ctx, PROPOSALS_COUNT_KEY, 0);
- }
- }
-
- //region SAFE METHODS
-
- /**
- * Gets the value of the parameter with {@code paramName}.
- *
- * @param paramName The name of the parameter, which is also its storage key.
- * @return the parameter's value.
- */
- @Safe
- public static Object getParameter(String paramName) {
- return parameters.get(paramName);
- }
-
- /**
- * @return all parameters and their values.
- */
- @Safe
- public static Map getParameters() {
- Iterator> it = parameters.find(FindOptions.RemovePrefix);
- Map params = new Map<>();
- while (it.next()) {
- Struct param = it.get();
- params.put(param.key, param.value);
- }
- return params;
- }
-
- /**
- * Gets all information of the proposal with {@code id}.
- *
- * @param id The proposal's id.
- * @return the proposal.
- */
- @Safe
- public static ProposalDTOOld getProposal(int id) {
- ProposalDTOOld dto = new ProposalDTOOld();
- dto.id = id;
- ByteString bytes = proposalData.get(id);
- if (bytes != null) {
- ProposalDataOld p = (ProposalDataOld) deserialize(bytes);
- dto.proposer = p.proposer;
- dto.linkedProposal = p.linkedProposal;
- dto.acceptanceRate = p.acceptanceRate;
- dto.quorum = p.quorum;
- dto.intents = p.intents;
- dto.offchainUri = p.offchainUri;
- } else {
- return null;
- }
- bytes = proposals.get(id);
- if (bytes != null) {
- Proposal p = (Proposal) deserialize(bytes);
- dto.endorser = p.endorser;
- dto.reviewEnd = p.reviewEnd;
- dto.votingEnd = p.votingEnd;
- dto.queuedEnd = p.timeLockEnd;
- dto.expiration = p.expiration;
- dto.executed = p.executed;
- }
- bytes = proposalVotes.get(id);
- if (bytes != null) {
- ProposalVotes p = (ProposalVotes) deserialize(bytes);
- dto.approve = p.approve;
- dto.reject = p.reject;
- dto.abstain = p.abstain;
- dto.voters = p.voters;
- }
- return dto;
- }
-
- /**
- * Returns the public keys of the governance members.
- *
- * The ordering of the returned list can change for consecutive calls.
- *
- * @return the members.
- */
- @Safe
- public static List getMembers() {
- Iterator it = members.find(ValuesOnly);
- List members = new List<>();
- while (it.next()) {
- members.add(new ECPoint(it.get()));
- }
- return members;
- }
-
- /**
- * Gets the number of members.
- *
- * @return the number of members.
- */
- @Safe
- public static int getMembersCount() {
- return Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY);
- }
-
- /**
- * Gets the number of proposals created on this contract.
- *
- * @return the number of proposals.
- */
- @Safe
- public static int getProposalCount() {
- return Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
- }
-
- /**
- * Gets the proposals on the given page.
- *
- * @param page The page.
- * @param itemsPerPage The number of proposals per page.
- * @return the chosen page, how many pages ther are with the given page size and the found
- * proposals on the given page.
- */
- @Safe
- public static Paginator.Paginated getProposals(int page, int itemsPerPage) throws Exception {
- if (page < 0)
- throw new Exception("[GrantSharesGov.getProposals] Page number was negative");
- if (itemsPerPage <= 0)
- throw new Exception("[GrantSharesGov.getProposals] Page number was negative or zero");
- int n = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
- int[] pagination = Paginator.calcPagination(n, page, itemsPerPage);
- List list = new List<>();
- for (int i = pagination[0]; i < pagination[1]; i++) {
- list.add(getProposal(i));
- }
- return new Paginator.Paginated(page, pagination[2], list);
- }
-
- /**
- * Checks if the contract is paused, i.e., if the corresponding value in the contract storage is
- * set to true.
- *
- * @return true if the contract is paused. False otherwise.
- */
- @Safe
- public static boolean isPaused() {
- return Storage.getBoolean(getReadOnlyContext(), PAUSED_KEY);
- }
-
-
- /**
- * Calculates the hash of the multi-sig account made up of the governance members. The signing threshold is
- * calculated from the value of the {@link GrantSharesGovOld#MULTI_SIG_THRESHOLD_KEY} parameter and the number of
- * members.
- *
- * @return The multi-sig account hash.
- */
- @Safe
- public static Hash160 calcMembersMultiSigAccount() throws Exception {
- return Account.createMultiSigAccount(calcMembersMultiSigAccountThreshold(), getMembers().toArray());
- }
-
- /**
- * Calculates the threshold of the multi-sig account made up of the governance members. It is calculated from the
- * value of the {@link GrantSharesGovOld#MULTI_SIG_THRESHOLD_KEY} parameter and the number of members.
- *
- * @return The multi-sig account signing threshold.
- */
- @Safe
- public static int calcMembersMultiSigAccountThreshold() throws Exception {
- int count = Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY);
- int thresholdRatio = parameters.getInt(MULTI_SIG_THRESHOLD_KEY);
- int thresholdTimes100 = count * thresholdRatio;
- int threshold = thresholdTimes100 / 100;
- if (thresholdTimes100 % 100 != 0) {
- threshold += 1; // Always round up.
- }
- if (threshold == 0)
- throw new Exception("[GrantSharesGov.calcMembersMultiSigAccountThreshold] Threshold was zero");
- return threshold;
- }
-
- //endregion SAFE METHODS
-
- // region GOVERNANCE PROCESS METHODS
-
- /**
- * Creates a proposal with the default settings for the acceptance rate and quorum.
- *
- * @param proposer The account set as the proposer.
- * @param intents The intents to be executed when the proposal is accepted.
- * @param offchainUri The URI of the part of the proposal that exists off-chain. E.g., a unique discussion URL.
- * @return The id of the proposal.
- */
- public static int createProposal(Hash160 proposer, IntentOld[] intents, String offchainUri, int linkedProposal)
- throws Exception {
-
- return createProposal(proposer, intents, offchainUri, linkedProposal,
- parameters.getInt(MIN_ACCEPTANCE_RATE_KEY),
- parameters.getInt(MIN_QUORUM_KEY));
- }
-
- /**
- * Creates a proposal.
- *
- * @param proposer The account set as the proposer.
- * @param intents The intents to be executed when the proposal is accepted.
- * @param offchainUri The URI of the part of the proposal that exists off-chain. E.g., a unique discussion URL.
- * @param linkedProposal A proposal that preceded this one.
- * @param acceptanceRate The desired acceptance rate.
- * @param quorum The desired quorum.
- * @return The id of the proposal.
- */
- public static int createProposal(Hash160 proposer, IntentOld[] intents, String offchainUri, int linkedProposal,
- int acceptanceRate, int quorum) throws Exception {
-
- if (!checkWitness(proposer))
- throw new Exception("[GrantSharesGov.createProposal] Not authorised");
- if (acceptanceRate < parameters.getInt(MIN_ACCEPTANCE_RATE_KEY) || acceptanceRate > 100)
- throw new Exception("[GrantSharesGov.createProposal] Invalid acceptance rate");
- if (quorum < parameters.getInt(MIN_QUORUM_KEY) || quorum > 100)
- throw new Exception("[GrantSharesGov.createProposal] Invalid quorum");
- if (linkedProposal >= 0 && proposals.get(linkedProposal) == null)
- throw new Exception("[GrantSharesGov.createProposal] Linked proposal doesn't exist");
- if (containsCallsToContractManagement(intents))
- throw new Exception("[GrantSharesGov.createProposal] Calls to ContractManagement not allowed");
-
- int id = Storage.getInt(getReadOnlyContext(), PROPOSALS_COUNT_KEY);
- int expiration = parameters.getInt(EXPIRATION_LENGTH_KEY) + getTime();
- proposals.put(id, serialize(new Proposal(id, expiration)));
- proposalData.put(id, serialize(new ProposalDataOld(proposer, linkedProposal, acceptanceRate, quorum, intents,
- offchainUri)));
- proposalVotes.put(id, serialize(new ProposalVotes()));
- Storage.put(ctx, PROPOSALS_COUNT_KEY, id + 1);
-
- // An event can take max 1024 bytes data. Thus, we're not passing the offchainUri since it could be longer.
- created.fire(id, proposer, acceptanceRate, quorum);
- return id;
- }
-
- private static boolean containsCallsToContractManagement(IntentOld[] intents) {
- for (IntentOld i : intents) {
- if (i.targetContract == ContractManagement.getHash()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * If the {@code endorser} is a DAO member and the proposal is an existing un-endorsed
- * proposal, it becomes endorsed and its phases are set.
- *
- * @param id The ID of the proposal to endorse.
- * @param endorser The script hash of the endorsing DAO member.
- */
- public static void endorseProposal(int id, Hash160 endorser) throws Exception {
- throwIfPaused();
- if (members.get(endorser.toByteString()) == null || !checkWitness(endorser))
- throw new Exception("[GrantSharesGov.endorseProposal] Not authorised");
- ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null)
- throw new Exception("[GrantSharesGov.endorseProposal] Proposal doesn't exist");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
- if (proposal.expiration <= getTime())
- throw new Exception("[GrantSharesGov.endorseProposal] Proposal expired");
- if (proposal.endorser != null)
- throw new Exception("[GrantSharesGov.endorseProposal] Proposal already endorsed");
-
- proposal.endorser = endorser;
- proposal.reviewEnd = getTime() + parameters.getInt(REVIEW_LENGTH_KEY);
- proposal.votingEnd = proposal.reviewEnd + parameters.getInt(VOTING_LENGTH_KEY);
- proposal.timeLockEnd = proposal.votingEnd + parameters.getInt(TIMELOCK_LENGTH_KEY);
- proposal.expiration = proposal.timeLockEnd + parameters.getInt(EXPIRATION_LENGTH_KEY);
- proposals.put(id, serialize(proposal));
- endorsed.fire(id, endorser);
- }
-
- /**
- * Casts a vote of the {@code voter} on the proposal with {@code id}.
- *
- * @param id The id of the proposal to vote on.
- * @param vote The vote. Must be either -1 for rejecting, 1 for approving or 0 for
- * abstaining.
- * @param voter The script hash of the voter. Must be a member of the DAO and the
- * invoking script must hold a witness of the voter.
- */
- public static void vote(int id, int vote, Hash160 voter) throws Exception {
- throwIfPaused();
- if (vote < -1 || vote > 1)
- throw new Exception("[GrantSharesGov.vote] Invalid vote");
- if (members.get(voter.toByteString()) == null || !checkWitness(voter))
- throw new Exception("[GrantSharesGov.vote] Not authorised");
- ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null)
- throw new Exception("[GrantSharesGov.vote] Proposal doesn't exist");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
- int time = getTime();
- if (proposal.endorser == null || time < proposal.reviewEnd || time >= proposal.votingEnd)
- throw new Exception("[GrantSharesGov.vote] Proposal not active");
- ProposalVotes pv = (ProposalVotes) deserialize(proposalVotes.get(id));
- if (pv.voters.containsKey(voter))
- throw new Exception("[GrantSharesGov.vote] Already voted on this proposal");
-
- pv.voters.put(voter, vote);
- if (vote < 0) {
- pv.reject += 1;
- } else if (vote > 0) {
- pv.approve += 1;
- } else {
- pv.abstain += 1;
- }
- proposalVotes.put(id, serialize(pv));
- voted.fire(id, voter, vote);
- }
-
- /**
- * Executes the proposal with the given {@code id}. Anyone can execute any proposal.
- *
- * Execution is only successful if the proposal is out of its queued phase, was accepted and
- * does not have a connected abrogation proposal that was accepted.
- *
- * @param id The proposal id.
- * @return the values returned by the proposal's intents.
- */
- public static Object[] execute(int id) throws Exception {
- throwIfPaused();
- ByteString proposalBytes = proposals.get(id);
- if (proposalBytes == null)
- throw new Exception("[GrantSharesGov.execute] Proposal doesn't exist");
- Proposal proposal = (Proposal) deserialize(proposalBytes);
- if (proposal.endorser == null || getTime() < proposal.timeLockEnd)
- throw new Exception("[GrantSharesGov.execute] Proposal not in execution phase");
- if (proposal.executed)
- throw new Exception("[GrantSharesGov.execute] Proposal already executed");
- if (proposal.expiration <= getTime())
- throw new Exception("[GrantSharesGov.execute] Proposal expired");
- ProposalDataOld data = (ProposalDataOld) deserialize(proposalData.get(id));
- ProposalVotes votes = (ProposalVotes) deserialize(proposalVotes.get(id));
- int voteCount = votes.approve + votes.abstain + votes.reject;
- if (voteCount * 100 / Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) < data.quorum)
- throw new Exception("[GrantSharesGov.execute] Quorum not reached");
- int yesNoCount = votes.approve + votes.reject;
- if (votes.approve * 100 / yesNoCount <= data.acceptanceRate)
- throw new Exception("[GrantSharesGov.execute] Proposal rejected");
-
- proposal.executed = true;
- Object[] returnVals = new Object[data.intents.length];
- proposals.put(id, serialize(proposal));
- for (int i = 0; i < data.intents.length; i++) {
- IntentOld t = data.intents[i];
- returnVals[i] = Contract.call(t.targetContract, t.method, CallFlags.All, t.params);
- }
- executed.fire(id);
- return returnVals;
- }
- // endregion GOVERNANCE PROCESS METHODS
-
- //region PROPOSAL-INVOKED METHODS
-
- /**
- * Changes the value of the parameter with {@code paramKey} to {@code value}.
- *
- * This method can only be called by the contract itself.
- *
- * @param paramKey The parameter's storage key.
- * @param value The new parameter value.
- */
- public static void changeParam(String paramKey, int value) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotSelf();
- throwOnInvalidValue(paramKey, value);
- parameters.put(paramKey, value);
- paramChanged.fire(paramKey, value);
- }
-
- private static void throwOnInvalidValue(String paramKey, int value) throws Exception {
- switch (paramKey) {
- case REVIEW_LENGTH_KEY:
- case VOTING_LENGTH_KEY:
- case TIMELOCK_LENGTH_KEY:
- case EXPIRATION_LENGTH_KEY:
- if (value < 0)
- throw new Exception("[GrantSharesGov.changeParam] Invalid parameter value");
- break;
- case MIN_ACCEPTANCE_RATE_KEY:
- case MIN_QUORUM_KEY:
- if (value < 0 || value > 100)
- throw new Exception("[GrantSharesGov.changeParam] Invalid parameter value");
- break;
- case MULTI_SIG_THRESHOLD_KEY:
- if (value <= 0 || value > 100)
- throw new Exception("[GrantSharesGov.changeParam] Invalid parameter value");
- break;
- default:
- throw new Exception("[GrantSharesGov.changeParam] Unknown parameter");
- }
- }
-
- /**
- * Adds the account with the given public key as a new member.
- *
- * This method can only be called by the contract itself.
- *
- * @param memberPubKey The new member's public key.
- */
- public static void addMember(ECPoint memberPubKey) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotSelf();
- Hash160 memberHash = createStandardAccount(memberPubKey);
- if (members.get(memberHash.toByteString()) != null)
- throw new Exception("[GrantSharesGov.addMember] Already a member");
- members.put(memberHash.toByteString(), memberPubKey.toByteString());
- Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) + 1);
- memberAdded.fire(memberHash);
- }
-
- /**
- * Removes the account with the given public key from the list of members.
- *
- * This method can only be called by the contract itself.
- *
- * @param memberPubKey The member to remove.
- */
- public static void removeMember(ECPoint memberPubKey) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotSelf();
- Hash160 memberHash = createStandardAccount(memberPubKey);
- if (members.get(memberHash.toByteString()) == null)
- throw new Exception("[GrantSharesGov.removeMember] Not a member");
- members.delete(memberHash.toByteString());
- Storage.put(ctx, MEMBERS_COUNT_KEY, Storage.getInt(getReadOnlyContext(), MEMBERS_COUNT_KEY) - 1);
- memberRemoved.fire(memberHash);
- }
-
- /**
- * Updates the contract to the new NEF and manifest.
- *
- * This method can only be called by the contract itself. It can be called even if the
- * contract is paused in case the contract needs a fix.
- *
- * @param nef The new contract NEF.
- * @param manifest The new contract manifest.
- * @param data Optional data passed to the update (_deploy) method.
- */
- public static void updateContract(ByteString nef, String manifest, Object data) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotSelf();
- updating.fire();
- ContractManagement.update(nef, manifest, data);
- }
- //endregion PROPOSAL-INVOKED METHODS
-
- public static void pause() throws Exception {
- if (!checkWitness(calcMembersMultiSigAccount()))
- throw new Exception("[GrantSharesGov.pause] Not authorized");
- Storage.put(ctx, PAUSED_KEY, 1);
- paused.fire();
- }
-
- public static void unpause() throws Exception {
- if (!checkWitness(calcMembersMultiSigAccount()))
- throw new Exception("[GrantSharesGov.unpause] Not authorized");
- Storage.put(ctx, PAUSED_KEY, 0);
- unpaused.fire();
- }
-
- private static void throwIfCallerIsNotSelf() throws Exception {
- if (Runtime.getCallingScriptHash() != Runtime.getExecutingScriptHash()) {
- throw new Exception("[GrantSharesGov] Method only callable by the contract itself");
- }
- }
-
- public static void throwIfPaused() throws Exception {
- if (Storage.getBoolean(getReadOnlyContext(), PAUSED_KEY)) {
- throw new Exception("[GrantSharesGov] Contract is paused");
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
index 5a8c795..3eab3de 100644
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
+++ b/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java
@@ -48,7 +48,9 @@
@ManifestExtra(key = "Email", value = "info@grantshares.io")
@ManifestExtra(key = "Description", value = "The treasury of the GrantShares DAO")
@ManifestExtra(key = "Website", value = "https://grantshares.io")
+//@formatter:off
@ContractSourceCode("https://github.com/AxLabs/grantshares-contracts/blob/main/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasury.java")
+//@formatter:on
@DisplayName("GrantSharesTreasury")
public class GrantSharesTreasury {
@@ -61,6 +63,7 @@ public class GrantSharesTreasury {
static final StorageMap funders = new StorageMap(ctx, FUNDERS_PREFIX); // [hash, List]
static final StorageMap whitelistedTokens = new StorageMap(ctx, WHITELISTED_TOKENS_PREFIX); // [hash, max_amount]
+ //region EVENTS
@DisplayName("FunderAdded")
static Event1Arg funderAdded;
@DisplayName("FunderRemoved")
@@ -87,8 +90,7 @@ public class GrantSharesTreasury {
static Event3Args tokensReceived;
@DisplayName("WhitelistedTokenMigrated")
static Event2Args whitelistedTokenMigrated;
- @DisplayName("Error")
- static Event2Args error;
+ //endregion EVENTS
/**
* Initialises this contract on deployment.
@@ -132,7 +134,7 @@ public static void deploy(Object data, boolean update) {
for (ECPoint key : accountKeys) {
assert ECPoint.isValid(key);
}
- funders.put(accountHash.toByteString(), StdLib.serialize(accountKeys));
+ funders.put(accountHash.toByteString(), new StdLib().serialize(accountKeys));
}
// Set whitelisted tokens
@@ -148,15 +150,6 @@ public static void deploy(Object data, boolean update) {
int thresholdRatio = (int) config[3];
assert thresholdRatio > 0 && thresholdRatio <= 100;
Storage.put(ctx, MULTI_SIG_THRESHOLD_KEY, thresholdRatio);
- } else {
- Map tokens = (Map) data;
- Hash160[] hashes = tokens.keys();
- Integer[] maxes = tokens.values();
- for (int i = 0; i < hashes.length; i++) {
- assert isValid(hashes[i]) && hashes[i] != zero() && maxes[i] > 0;
- whitelistedTokens.put(hashes[i].toByteString(), maxes[i]);
- whitelistedTokenMigrated.fire(hashes[i], maxes[i]);
- }
}
}
@@ -177,7 +170,7 @@ public static void onNep17Payment(Hash160 sender, int amount, Object data) {
assert whitelistedTokens.get(Runtime.getCallingScriptHash().toByteString()) != null;
if (sender == null) {
// Only allow new token minting from GasToken.
- assert getCallingScriptHash() == GasToken.getHash();
+ assert getCallingScriptHash() == new GasToken().getHash();
return;
}
assert funders.get(sender.toByteString()) != null;
@@ -195,7 +188,7 @@ public static Map getFunders() {
Map funders = new Map<>();
while (it.next()) {
Struct entry = it.get();
- funders.put(new Hash160(entry.key), (ECPoint[]) StdLib.deserialize(entry.value));
+ funders.put(new Hash160(entry.key), (ECPoint[]) new StdLib().deserialize(entry.value));
}
return funders;
}
@@ -204,7 +197,7 @@ private static List getFunderPublicKeys() {
Iterator it = funders.find(ValuesOnly);
List pubKeys = new List<>();
while (it.next()) {
- ECPoint[] keys = (ECPoint[]) StdLib.deserialize(it.get());
+ ECPoint[] keys = (ECPoint[]) new StdLib().deserialize(it.get());
for (ECPoint key : keys) {
pubKeys.add(key);
}
@@ -224,7 +217,8 @@ private static List getFunderPublicKeys() {
public static Hash160 calcFundersMultiSigAddress() throws Exception {
List funderPublicKeys = getFunderPublicKeys();
return Account.createMultiSigAccount(calcFundersMultiSigAddressThreshold(funderPublicKeys.size()),
- funderPublicKeys.toArray());
+ funderPublicKeys.toArray()
+ );
}
/**
@@ -255,8 +249,9 @@ private static int calcFundersMultiSigAddressThreshold(int count) throws Excepti
if (thresholdTimes100 % 100 != 0) {
threshold += 1; // Always round up.
}
- if (threshold == 0)
+ if (threshold == 0) {
throw new Exception("[GrantSharesTreasury.calcFundersMultiSigAddressThreshold] Threshold was zero");
+ }
return threshold;
}
@@ -284,7 +279,8 @@ public static Map getWhitelistedTokens() {
@Safe
public static boolean isPaused() {
return (boolean) Contract.call(new Hash160(Storage.get(getReadOnlyContext(), OWNER_KEY)),
- "isPaused", CallFlags.ReadOnly, new Object[]{});
+ "isPaused", CallFlags.ReadOnly, new Object[]{}
+ );
}
/**
@@ -308,8 +304,9 @@ public static int getFundersMultiSigThresholdRatio() {
public static void setFundersMultiSigThresholdRatio(Integer value) {
abortIfPaused();
abortIfCallerIsNotOwner();
- if (value <= 0 || value > 100)
- fireErrorAndAbort("Invalid threshold ratio", "setFundersMultiSigThresholdRatio");
+ if (value <= 0 || value > 100) {
+ Helper.abort("setFundersMultiSigThresholdRatio" + ": " + "Invalid threshold ratio");
+ }
Storage.put(ctx, MULTI_SIG_THRESHOLD_KEY, value);
thresholdChanged.fire(value);
}
@@ -328,13 +325,13 @@ public static void setFundersMultiSigThresholdRatio(Integer value) {
public static void addFunder(Hash160 accountHash, ECPoint[] publicKeys) {
abortIfPaused();
abortIfCallerIsNotOwner();
- if (funders.get(accountHash.toByteString()) != null) fireErrorAndAbort("Already a funder", "addFunder");
- if (!isValid(accountHash) || accountHash == zero()) fireErrorAndAbort("Invalid funder hash", "addFunder");
- if (publicKeys.length == 0) fireErrorAndAbort("List of public keys is empty", "addFunder");
+ if (funders.get(accountHash.toByteString()) != null) Helper.abort("addFunder" + ": " + "Already a funder");
+ if (!isValid(accountHash) || accountHash == zero()) Helper.abort("addFunder" + ": " + "Invalid funder hash");
+ if (publicKeys.length == 0) Helper.abort("addFunder" + ": " + "List of public keys is empty");
for (ECPoint key : publicKeys) {
- if (!ECPoint.isValid(key)) fireErrorAndAbort("Invalid public key", "addFunder");
+ if (!ECPoint.isValid(key)) Helper.abort("addFunder" + ": " + "Invalid public key");
}
- funders.put(accountHash.toByteString(), StdLib.serialize(publicKeys));
+ funders.put(accountHash.toByteString(), new StdLib().serialize(publicKeys));
funderAdded.fire(accountHash);
}
@@ -348,7 +345,7 @@ public static void addFunder(Hash160 accountHash, ECPoint[] publicKeys) {
public static void removeFunder(Hash160 accountHash) {
abortIfPaused();
abortIfCallerIsNotOwner();
- if (funders.get(accountHash.toByteString()) == null) fireErrorAndAbort("Not a funder", "removeFunder");
+ if (funders.get(accountHash.toByteString()) == null) Helper.abort("removeFunder" + ": " + "Not a funder");
funders.delete(accountHash.toByteString());
funderRemoved.fire(accountHash);
}
@@ -365,8 +362,8 @@ public static void removeFunder(Hash160 accountHash) {
public static void addWhitelistedToken(Hash160 token, int maxFundingAmount) {
abortIfPaused();
abortIfCallerIsNotOwner();
- if (!isValid(token) || token == zero()) fireErrorAndAbort("Invalid token hash", "addWhitelistedToken");
- if (maxFundingAmount <= 0) fireErrorAndAbort("Invalid max funding amount", "addWhitelistedToken");
+ if (!isValid(token) || token == zero()) Helper.abort("addWhitelistedToken" + ": " + "Invalid token hash");
+ if (maxFundingAmount <= 0) Helper.abort("addWhitelistedToken" + ": " + "Invalid max funding amount");
whitelistedTokens.put(token.toByteString(), maxFundingAmount);
whitelistedTokenAdded.fire(token, maxFundingAmount);
}
@@ -381,8 +378,9 @@ public static void addWhitelistedToken(Hash160 token, int maxFundingAmount) {
public static void removeWhitelistedToken(Hash160 token) {
abortIfPaused();
abortIfCallerIsNotOwner();
- if (whitelistedTokens.get(token.toByteString()) == null)
- fireErrorAndAbort("Not a whitelisted token", "removeWhitelistedToken");
+ if (whitelistedTokens.get(token.toByteString()) == null) {
+ Helper.abort("removeWhitelistedToken" + ": " + "Not a whitelisted token");
+ }
whitelistedTokens.delete(token.toByteString());
whitelistedTokenRemoved.fire(token);
}
@@ -401,8 +399,8 @@ public static void releaseTokens(Hash160 tokenContract, Hash160 to, int amount)
abortIfPaused();
abortIfCallerIsNotOwner();
int maxFundingAmount = whitelistedTokens.getIntOrZero(tokenContract.toByteString());
- if (maxFundingAmount == 0) fireErrorAndAbort("Token not whitelisted", "releaseTokens");
- if (amount > maxFundingAmount) fireErrorAndAbort("Above token's max funding amount", "releaseTokens");
+ if (maxFundingAmount == 0) Helper.abort("releaseTokens" + ": " + "Token not whitelisted");
+ if (amount > maxFundingAmount) Helper.abort("releaseTokens" + ": " + "Above token's max funding amount");
Object[] params = new Object[]{Runtime.getExecutingScriptHash(), to, amount, new Object[]{}};
boolean success = (boolean) Contract.call(tokenContract, "transfer", CallFlags.All, params);
if (success) {
@@ -419,14 +417,14 @@ public static void releaseTokens(Hash160 tokenContract, Hash160 to, int amount)
* paused.
*/
public static void drain() {
- if (!isPaused()) fireErrorAndAbort("Contract is not paused", "drain");
+ if (!isPaused()) Helper.abort("drain" + ": " + "Contract is not paused");
Hash160 fundersMultiAddress = null;
try {
fundersMultiAddress = calcFundersMultiSigAddress();
} catch (Exception e) {
- fireErrorAndAbort(e.getMessage(), "drain");
+ Helper.abort("drain" + ": " + e.getMessage());
}
- if (!checkWitness(fundersMultiAddress)) fireErrorAndAbort("Not authorized", "drain");
+ if (!checkWitness(fundersMultiAddress)) Helper.abort("drain" + ": " + "Not authorized");
Hash160 selfHash = Runtime.getExecutingScriptHash();
Iterator it = whitelistedTokens.find((byte) (RemovePrefix | KeysOnly));
while (it.next()) {
@@ -450,14 +448,15 @@ public static void drain() {
public static void voteCommitteeMemberWithLeastVotes() {
abortIfPaused();
ECPoint c = getCommitteeMemberWithLeastVotes();
- if (!NeoToken.vote(Runtime.getExecutingScriptHash(), c))
- fireErrorAndAbort("Failed voting on candidate", "voteCommitteeMemberWithLeastVotes");
+ if (!new NeoToken().vote(Runtime.getExecutingScriptHash(), c)) {
+ Helper.abort("voteCommitteeMemberWithLeastVotes" + ": " + "Failed voting on candidate");
+ }
voted.fire(c);
}
private static ECPoint getCommitteeMemberWithLeastVotes() {
- NeoToken.Candidate[] candidates = NeoToken.getCandidates();
- List committee = new List<>(NeoToken.getCommittee());
+ NeoToken.Candidate[] candidates = new NeoToken().getCandidates();
+ List committee = new List<>(new NeoToken().getCommittee());
int leastVotes = 100000000; // just a large number for initialisation
ECPoint leastVotesMember = null;
for (int i = 0; i < candidates.length; i++) {
@@ -485,21 +484,16 @@ public static void updateContract(ByteString nef, String manifest, Object data)
abortIfPaused();
abortIfCallerIsNotOwner();
updating.fire();
- ContractManagement.update(nef, manifest, data);
+ new ContractManagement().update(nef, manifest, data);
}
private static void abortIfCallerIsNotOwner() {
- if (Runtime.getCallingScriptHash().toByteString() != Storage.get(getReadOnlyContext(), OWNER_KEY))
- fireErrorAndAbort("Not authorised", "abortIfCallerIsNotOwner");
+ if (Runtime.getCallingScriptHash().toByteString() != Storage.get(getReadOnlyContext(), OWNER_KEY)) {
+ Helper.abort("abortIfCallerIsNotOwner" + ": " + "Not authorised");
+ }
}
private static void abortIfPaused() {
- if (isPaused()) fireErrorAndAbort("Contract is paused", "abortIfCallerIsNotOwner");
+ if (isPaused()) Helper.abort("abortIfCallerIsNotOwner" + ": " + "Contract is paused");
}
-
- private static void fireErrorAndAbort(String msg, String method) {
- error.fire(msg, method);
- Helper.abort();
- }
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasuryOld.java b/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasuryOld.java
deleted file mode 100644
index 59e221a..0000000
--- a/src/main/java/com/axlabs/neo/grantshares/GrantSharesTreasuryOld.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import io.neow3j.devpack.Account;
-import io.neow3j.devpack.ByteString;
-import io.neow3j.devpack.Contract;
-import io.neow3j.devpack.ECPoint;
-import io.neow3j.devpack.Hash160;
-import io.neow3j.devpack.Helper;
-import io.neow3j.devpack.Iterator;
-import io.neow3j.devpack.Iterator.Struct;
-import io.neow3j.devpack.List;
-import io.neow3j.devpack.Map;
-import io.neow3j.devpack.Runtime;
-import io.neow3j.devpack.Storage;
-import io.neow3j.devpack.StorageContext;
-import io.neow3j.devpack.StorageMap;
-import io.neow3j.devpack.annotations.ContractSourceCode;
-import io.neow3j.devpack.annotations.DisplayName;
-import io.neow3j.devpack.annotations.ManifestExtra;
-import io.neow3j.devpack.annotations.OnDeployment;
-import io.neow3j.devpack.annotations.OnNEP17Payment;
-import io.neow3j.devpack.annotations.Permission;
-import io.neow3j.devpack.annotations.Safe;
-import io.neow3j.devpack.constants.CallFlags;
-import io.neow3j.devpack.contracts.ContractManagement;
-import io.neow3j.devpack.contracts.GasToken;
-import io.neow3j.devpack.contracts.NeoToken;
-import io.neow3j.devpack.contracts.StdLib;
-import io.neow3j.devpack.events.Event1Arg;
-import io.neow3j.devpack.events.Event2Args;
-import io.neow3j.devpack.events.Event3Args;
-
-import static io.neow3j.devpack.Runtime.checkWitness;
-import static io.neow3j.devpack.Runtime.getCallingScriptHash;
-import static io.neow3j.devpack.Storage.getReadOnlyContext;
-import static io.neow3j.devpack.constants.FindOptions.KeysOnly;
-import static io.neow3j.devpack.constants.FindOptions.RemovePrefix;
-import static io.neow3j.devpack.constants.FindOptions.ValuesOnly;
-
-@SuppressWarnings("unchecked")
-@Permission(contract = "0xfffdc93764dbaddd97c48f252a53ea4643faa3fd", methods = "update") // ContractManagement
-@Permission(contract = "0xef4073a0f2b305a38ec4050e4d3d28bc40ea63f5", methods = "vote") // NeoToken
-@Permission(contract = "*", methods = "transfer")
-@ManifestExtra(key = "Author", value = "AxLabs")
-@ManifestExtra(key = "Email", value = "info@grantshares.io")
-@ManifestExtra(key = "Description", value = "The treasury of the GrantShares DAO")
-@ManifestExtra(key = "Website", value = "https://grantshares.io")
-@ContractSourceCode("TODO: Set this to the URL of the release branch before deploying.")
-@DisplayName("GrantSharesTreasury")
-public class GrantSharesTreasuryOld {
-
- static final String OWNER_KEY = "owner";
- static final String FUNDERS_PREFIX = "funders";
- static final String WHITELISTED_TOKENS_PREFIX = "whitelistedTokens";
- static final String MULTI_SIG_THRESHOLD_KEY = "threshold";
-
- static final StorageContext ctx = Storage.getStorageContext();
- static final StorageMap funders = new StorageMap(ctx, FUNDERS_PREFIX); // [hash, List]
- static final StorageMap whitelistedTokens = new StorageMap(ctx, WHITELISTED_TOKENS_PREFIX); // [hash, max_amount]
-
- @DisplayName("FunderAdded")
- static Event1Arg funderAdded;
- @DisplayName("FunderRemoved")
- static Event1Arg funderRemoved;
- @DisplayName("WhitelistedTokenAdded")
- static Event2Args whitelistedTokenAdded;
- @DisplayName("WhitelistedTokenRemoved")
- static Event1Arg whitelistedTokenRemoved;
- @DisplayName("ThresholdChanged")
- static Event1Arg thresholdChanged;
- @DisplayName("TokenReleased")
- static Event3Args tokensReleased;
- @DisplayName("TokenReleaseFailed")
- static Event3Args releaseFailed;
-
- /**
- * Initialises this contract on deployment.
- *
- * The data parameter has to be structured as follows:
- *
- * [
- * Hash160 grantSharesGovHash,
- * [
- * Hash160 funderAddress1: [ECPoint funder1PublicKey1, ECPoint funder1PublicKey2, ...]
- * Hash160 funderAddress2: [ECPoint funder2PublicKey1]
- * ...
- * ],
- * [
- * Hash160 tokenHash1: int maxFundingAmountToken1,
- * Hash160 tokenHash2: int maxFundingAmountToken2
- * ...
- * ],
- * int fundersMultiSigThresholdRatio
- * ]
- *
- *
- * @param data The data to set up the treasury's storage with.
- * @param update Tells if the method is called for updating this contract.
- */
- @OnDeployment
- public static void deploy(Object data, boolean update) {
- if (!update) {
- Object[] config = (Object[]) data;
- // Set owner
- Storage.put(ctx, OWNER_KEY, (Hash160) config[0]);
-
- // Set initial funders.
- Object[][] accounts = (Object[][]) config[1]; // [ [hash, [keys...]], [hash, [keys...]] ]
- for (Object[] account : accounts) {
- Hash160 accountHash = (Hash160) account[0];
- ECPoint[] accountKeys = (ECPoint[]) account[1];
- funders.put(accountHash.toByteString(), StdLib.serialize(accountKeys));
- }
-
- // Set whitelisted tokens
- Map tokens = (Map) config[2];
- Hash160[] hashes = tokens.keys();
- Integer[] maxes = tokens.values();
- for (int i = 0; i < hashes.length; i++) {
- whitelistedTokens.put(hashes[i].toByteString(), maxes[i]);
- }
-
- // set parameter
- Storage.put(ctx, MULTI_SIG_THRESHOLD_KEY, (int) config[3]);
- }
- }
-
- /**
- * Checks if the sender is an eligible funder and if the transferred token is whitelisted.
- *
- * Fails if the contract is paused.
- *
- * If the received token is NEO, then a vote is cast on the committee member with the least votes.
- *
- * @param sender The token sender.
- * @param amount The transferred amount.
- * @param data Data sent with the transfer.
- */
- @OnNEP17Payment
- public static void onNep17Payment(Hash160 sender, int amount, Object data) throws Exception {
- assert !isPaused();
- assert whitelistedTokens.get(Runtime.getCallingScriptHash().toByteString()) != null;
- if (sender == null) {
- // Only allow new token minting from GasToken.
- assert getCallingScriptHash() == GasToken.getHash();
- return;
- }
- assert funders.get(sender.toByteString()) != null;
- }
-
- /**
- * Places the treasuries vote on the committee member with the least votes.
- *
- * @throws Exception if voting was not successful.
- */
- public static void voteCommitteeMemberWithLeastVotes() throws Exception {
- throwIfPaused();
- ECPoint c = getCommitteeMemberWithLeastVotes();
- if (!NeoToken.vote(Runtime.getExecutingScriptHash(), c))
- throw new Exception("[GrantSharesTreasury.voteCommitteeMemberWithLeastVotes] Failed voting on candidate " +
- c.toByteString().toString());
- }
-
- private static ECPoint getCommitteeMemberWithLeastVotes() {
- NeoToken.Candidate[] candidates = NeoToken.getCandidates();
- List committee = new List<>(NeoToken.getCommittee());
- int leastVotes = 100000000; // just a large number for initialisation
- ECPoint leastVotesMember = null;
- for (int i = 0; i < candidates.length; i++) {
- NeoToken.Candidate candidate = candidates[i];
- for (int j = 0; j < committee.size(); j++) {
- if (committee.get(j) == candidate.publicKey) {
- committee.remove(j); // Remove the committee member from list to shorten the loop.
- if (candidate.votes < leastVotes) {
- leastVotesMember = candidate.publicKey;
- leastVotes = candidate.votes;
- }
- }
- }
- }
- return leastVotesMember;
- }
-
- /**
- * Gets all funders eligible to send funds to the treasury.
- *
- * @return the funder's addresses and their corresponding public keys.
- */
- @Safe
- public static Map getFunders() {
- Iterator> it = funders.find(RemovePrefix);
- Map funders = new Map<>();
- while (it.next()) {
- Struct entry = it.get();
- funders.put(new Hash160(entry.key), (ECPoint[]) StdLib.deserialize(entry.value));
- }
- return funders;
- }
-
- private static List getFunderPublicKeys() {
- Iterator it = funders.find(ValuesOnly);
- List pubKeys = new List<>();
- while (it.next()) {
- ECPoint[] keys = (ECPoint[]) StdLib.deserialize(it.get());
- for (ECPoint key : keys) {
- pubKeys.add(key);
- }
- }
- return pubKeys;
- }
-
- /**
- * Calculates the hash of the multi-sig address made up of the governance members. The signing threshold is
- * calculated from the value of the {@link GrantSharesGov#MULTI_SIG_THRESHOLD_KEY} parameter and the number of
- * public keys involved in the treasury as funders. This number can be higher than the number of funder
- * addresses because of possible multi-sig addresses.
- *
- * @return The multi-sig account hash.
- */
- @Safe
- public static Hash160 calcFundersMultiSigAddress() {
- List funderPublicKeys = getFunderPublicKeys();
- return Account.createMultiSigAccount(calcFundersMultiSigAddressThreshold(funderPublicKeys.size()),
- funderPublicKeys.toArray());
- }
-
- /**
- * Calculates the threshold of the multi-sig address made up of the treasury funders. It is calculated from the
- * value of the {@link GrantSharesGov#MULTI_SIG_THRESHOLD_KEY} parameter and the number of public keys involved
- * in the treasury as funders. This number can be higher than the number of funder addresses because of
- * possible multi-sig addresses.
- *
- * @return The multi-sig account signing threshold.
- */
- @Safe
- public static int calcFundersMultiSigAddressThreshold() {
- return calcFundersMultiSigAddressThreshold(getFunderPublicKeys().size());
- }
-
- /**
- * Calculates the threshold of the multi-sig address made up of the treasury funders. It is calculated from the
- * value of the {@link GrantSharesGov#MULTI_SIG_THRESHOLD_KEY} parameter and the given number of involved public
- * keys.
- *
- * @param count The number of public keys involved in the treasury as funders.
- * @return The multi-sig account signing threshold.
- */
- private static int calcFundersMultiSigAddressThreshold(int count) {
- int thresholdRatio = Storage.getInt(getReadOnlyContext(), MULTI_SIG_THRESHOLD_KEY);
- int thresholdTimes100 = count * thresholdRatio;
- int threshold = thresholdTimes100 / 100;
- if (thresholdTimes100 % 100 != 0) {
- threshold += 1; // Always round up.
- }
- return threshold;
- }
-
- /**
- * Gets all whitelisted tokens.
- *
- * @return a map of token hashes to the corresponding max funding amount set for the tokens.
- */
- @Safe
- public static Map getWhitelistedTokens() {
- Iterator> it = whitelistedTokens.find(RemovePrefix);
- Map tokens = new Map<>();
- while (it.next()) {
- Struct i = it.get();
- tokens.put(i.key, i.value);
- }
- return tokens;
- }
-
- /**
- * Checks if the contract is paused.
- *
- * @return true if paused. False otherwise.
- */
- @Safe
- public static boolean isPaused() {
- return (boolean) Contract.call(new Hash160(Storage.get(getReadOnlyContext(), OWNER_KEY)),
- "isPaused", CallFlags.ReadOnly, new Object[]{});
- }
-
- /**
- * Gets the signing threshold ratio of the funders multi-sig account.
- *
- * @return the signing threshold ratio
- */
- @Safe
- public static int getFundersMultiSigThresholdRatio() {
- return Storage.getInt(getReadOnlyContext(), MULTI_SIG_THRESHOLD_KEY);
- }
-
- /**
- * Sets the signing threshold ratio of the funders multi-sig account. The actual threshold is calculated from the
- * number of funder public keys times this ratio.
- *
- * This method can only be called by the treasury owner and fails if the contract is paused.
- *
- * @param value The new threshold value.
- */
- public static void setFundersMultiSigThresholdRatio(Integer value) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- Storage.put(ctx, MULTI_SIG_THRESHOLD_KEY, value);
- thresholdChanged.fire(value);
- }
-
-
- /**
- * Adds the given account as a whitelisted funder to the treasury. Only whitelisted funders can transfer tokens to
- * the treasury. The public key(s) are necessary for the multi-sig address generated from all funders that can be
- * used to withdraw all treasury funds.
- *
- * This method must be called by the treasury owner and fails if the contract is paused.
- *
- * @param accountHash The account to add to the funders list.
- * @param publicKeys The public key(s) that are part of the account. One, in case of a single-sig account.
- * Multiple, in case of a multi-sig account.
- */
- public static void addFunder(Hash160 accountHash, ECPoint[] publicKeys) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- if (funders.get(accountHash.toByteString()) != null)
- throw new Exception("[GrantSharesTreasury.addFunder] Already a funder");
- funders.put(accountHash.toByteString(), StdLib.serialize(publicKeys));
- funderAdded.fire(accountHash);
- }
-
- /**
- * Removes the given account from the whitelisted funders.
- *
- * This method must be called by the treasury owner and fails if the contract is paused.
- *
- * @param accountHash The funder account to remove.
- */
- public static void removeFunder(Hash160 accountHash) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- if (funders.get(accountHash.toByteString()) == null)
- throw new Exception("[GrantSharesTreasury.addFunder] Not a funder");
- funders.delete(accountHash.toByteString());
- funderRemoved.fire(accountHash);
- }
-
- /**
- * Adds the given token to the whitelist or overwrites the tokens max funding amount if it is
- * already whitelisted.
- *
- * This method must be called by the treasury owner and fails if the contract is paused.
- *
- * @param token The token to add to the whitelist.
- * @param maxFundingAmount The max funding amount for the token.
- */
- public static void addWhitelistedToken(Hash160 token, int maxFundingAmount) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- whitelistedTokens.put(token.toByteString(), maxFundingAmount);
- whitelistedTokenAdded.fire(token, maxFundingAmount);
- }
-
- /**
- * Removes the given token from the whitelist.
- *
- * This method must be called by the treasury owner and fails if the contract is paused.
- *
- * @param token The token to remove from the whitelist.
- */
- public static void removeWhitelistedToken(Hash160 token) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- if (whitelistedTokens.get(token.toByteString()) == null)
- throw new Exception("[GrantSharesTreasury.removeWhitelistedToken] Not a whitelisted token");
- whitelistedTokens.delete(token.toByteString());
- whitelistedTokenRemoved.fire(token);
- }
-
- /**
- * Calls the transfer method of {@code tokenContract} with the given amount and receiver. The
- * sender being this treasury contract.
- *
- * This method fails if the contract is paused.
- *
- * @param tokenContract The token to transfer.
- * @param to The receiver of the transfer.
- * @param amount The amount to transfer.
- */
- public static void releaseTokens(Hash160 tokenContract, Hash160 to, int amount) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- int maxFundingAmount = whitelistedTokens.getIntOrZero(tokenContract.toByteString());
- if (maxFundingAmount == 0)
- throw new Exception("[GrantSharesTreasury.releaseTokens] Token not whitelisted");
- if (amount > maxFundingAmount)
- throw new Exception("[GrantSharesTreasury.releaseTokens] Above token's max funding amount");
- Object[] params = new Object[]{
- Runtime.getExecutingScriptHash(), to, amount, new Object[]{}};
- boolean success = (boolean) Contract.call(tokenContract, "transfer", CallFlags.All, params);
- if (success) {
- tokensReleased.fire(tokenContract, to, amount);
- } else {
- releaseFailed.fire(tokenContract, to, amount);
- }
- }
-
- /**
- * Drain all tokens from the treasury contract to the funders multi-sig address.
- *
- * This method can only be called by the funders multi-sig account when the {@link GrantSharesGov} contract is
- * paused.
- */
- public static void drain() throws Exception {
- if (!isPaused())
- throw new Exception("[GrantSharesTreasury.drain] Contract is not paused");
- Hash160 fundersMultiAddress = calcFundersMultiSigAddress();
- if (!checkWitness(fundersMultiAddress))
- throw new Exception("[GrantSharesTreasury.drain] Not authorized");
-
- Hash160 selfHash = Runtime.getExecutingScriptHash();
- Iterator it = whitelistedTokens.find((byte) (RemovePrefix | KeysOnly));
-
- while (it.next()) {
- Hash160 token = new Hash160(it.get());
- int balance = (int) Contract.call(token, "balanceOf", CallFlags.ReadOnly, new Object[]{selfHash});
- if (balance > 0) {
- Object[] params = new Object[]{selfHash, fundersMultiAddress, balance, new Object[]{}};
- Contract.call(token, "transfer", CallFlags.All, params);
- }
- }
- }
-
- /**
- * Updates the contract to the new NEF and manifest.
- *
- * This method can only be called by the owner. It can be called even if the contract is paused
- * in case the contract needs a fix.
- */
- public static void updateContract(ByteString nef, String manifest, Object data) throws Exception {
- throwIfPaused();
- throwIfCallerIsNotOwner();
- ContractManagement.update(nef, manifest, data);
- }
-
- private static void throwIfCallerIsNotOwner() throws Exception {
- if (Runtime.getCallingScriptHash().toByteString() != Storage.get(getReadOnlyContext(), OWNER_KEY))
- throw new Exception("[GrantSharesTreasury] Not authorised");
- }
-
- private static void throwIfPaused() throws Exception {
- if (isPaused())
- throw new Exception("[GrantSharesTreasury] Contract is paused");
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/axlabs/neo/grantshares/IntentOld.java b/src/main/java/com/axlabs/neo/grantshares/IntentOld.java
deleted file mode 100644
index 656e028..0000000
--- a/src/main/java/com/axlabs/neo/grantshares/IntentOld.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import io.neow3j.devpack.Hash160;
-
-/**
- * Represents an action of a proposal. Proposals are made up of one or more intents that are executed once the
- * proposal is accepted.
- */
-public class IntentOld {
-
- /**
- * The contract to be called.
- */
- public Hash160 targetContract;
-
- /**
- * The method to be called.
- */
- public String method;
-
- /**
- * The parameters to pass to the method.
- */
- public Object[] params;
-
- public IntentOld(Hash160 targetContract, String method, Object[] params) {
- this.targetContract = targetContract;
- this.method = method;
- this.params = params;
- }
-}
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalDTO.java b/src/main/java/com/axlabs/neo/grantshares/ProposalDTO.java
index 08b4b75..d02c1d6 100644
--- a/src/main/java/com/axlabs/neo/grantshares/ProposalDTO.java
+++ b/src/main/java/com/axlabs/neo/grantshares/ProposalDTO.java
@@ -4,7 +4,7 @@
import io.neow3j.devpack.Map;
/**
- * Used to return all proposal information as one structure in getter methods of the {@link GrantSharesGovOld} contract.
+ * Used to return all proposal information as one structure in getter methods of the {@link GrantSharesGov} contract.
*/
public class ProposalDTO {
@@ -13,6 +13,7 @@ public class ProposalDTO {
public int linkedProposal;
public int acceptanceRate;
public int quorum;
+ public int quorumVotes;
public Hash160 endorser;
public int reviewEnd;
public int votingEnd;
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalDTOOld.java b/src/main/java/com/axlabs/neo/grantshares/ProposalDTOOld.java
deleted file mode 100644
index d6746cc..0000000
--- a/src/main/java/com/axlabs/neo/grantshares/ProposalDTOOld.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import io.neow3j.devpack.Hash160;
-import io.neow3j.devpack.Map;
-
-/**
- * Used to return all proposal information as one structure in getter methods of the {@link GrantSharesGovOld} contract.
- */
-public class ProposalDTOOld {
-
- public int id;
- public Hash160 proposer;
- public int linkedProposal;
- public int acceptanceRate;
- public int quorum;
- public Hash160 endorser;
- public int reviewEnd;
- public int votingEnd;
- public int queuedEnd;
- public int expiration;
- public boolean executed;
- public IntentOld[] intents;
- public String offchainUri;
- public int approve;
- public int reject;
- public int abstain;
- public Map voters;
-
- public ProposalDTOOld() {
- }
-}
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalData.java b/src/main/java/com/axlabs/neo/grantshares/ProposalData.java
index 4ed28e6..0bc1d31 100644
--- a/src/main/java/com/axlabs/neo/grantshares/ProposalData.java
+++ b/src/main/java/com/axlabs/neo/grantshares/ProposalData.java
@@ -4,7 +4,7 @@
/**
* Proposal information that is set at the time of creation of a proposal and doesn't change after that.
- * This data was separated from {@link Proposal} in order to save storage costs when updating a proposal.
+ * This data was separated from {@link ProposalV1} in order to save storage costs when updating a proposal.
*/
public class ProposalData {
@@ -49,5 +49,4 @@ public ProposalData(Hash160 proposer, int linkedProposal, int acceptanceRate,
this.intents = intents;
this.offchainUri = offchainUri;
}
-
}
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalDataOld.java b/src/main/java/com/axlabs/neo/grantshares/ProposalDataOld.java
deleted file mode 100644
index ff2d9b7..0000000
--- a/src/main/java/com/axlabs/neo/grantshares/ProposalDataOld.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import io.neow3j.devpack.Hash160;
-
-/**
- * Proposal information that is set at the time of creation of a proposal and doesn't change after that.
- * This data was separated from {@link Proposal} in order to save storage costs when updating a proposal.
- */
-public class ProposalDataOld {
-
- /**
- * The creator of the proposal.
- */
- public Hash160 proposer;
-
- /**
- * Allows linking to a corresponding proposal. Should be set to -1 if no linked proposal exists.
- */
- public int linkedProposal;
-
- /**
- * The necessary proportion of yes votes required for accepting this proposal. Given in percentage. E.g., a value
- * of 50 means that the simple majority is necessary for the proposal to pass.
- */
- public int acceptanceRate;
-
- /**
- * The necessary voter participation for this proposal to reach quorum. E.g., a value of 50 means that 50% of the
- * members have to vote in order for the proposal to reach its quorum.
- */
- public int quorum;
-
- /**
- * The proposal's intents executed if it gets accepted.
- */
- public IntentOld[] intents;
-
- /**
- * The URL of the GitHub issue where this proposal is discussed.
- */
- public String offchainUri;
-
- public ProposalDataOld(Hash160 proposer, int linkedProposal, int acceptanceRate,
- int quorum, IntentOld[] intents, String offchainUri) {
- this.proposer = proposer;
- this.linkedProposal = linkedProposal;
- this.acceptanceRate = acceptanceRate;
- this.quorum = quorum;
- this.intents = intents;
- this.offchainUri = offchainUri;
- }
-}
diff --git a/src/main/java/com/axlabs/neo/grantshares/Proposal.java b/src/main/java/com/axlabs/neo/grantshares/ProposalV1.java
similarity index 94%
rename from src/main/java/com/axlabs/neo/grantshares/Proposal.java
rename to src/main/java/com/axlabs/neo/grantshares/ProposalV1.java
index 1a94d58..c498535 100644
--- a/src/main/java/com/axlabs/neo/grantshares/Proposal.java
+++ b/src/main/java/com/axlabs/neo/grantshares/ProposalV1.java
@@ -7,7 +7,7 @@
*
* Additional proposal information is added via the {@link ProposalData struct}.
*/
-public class Proposal {
+public class ProposalV1 {
/**
* The proposals ID. IDs are assigned incrementally.
@@ -45,7 +45,7 @@ public class Proposal {
*/
public boolean executed;
- public Proposal(int id, int expiration) {
+ public ProposalV1(int id, int expiration) {
this.id = id;
endorser = null;
reviewEnd = 0;
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalV2.java b/src/main/java/com/axlabs/neo/grantshares/ProposalV2.java
new file mode 100644
index 0000000..9849fb2
--- /dev/null
+++ b/src/main/java/com/axlabs/neo/grantshares/ProposalV2.java
@@ -0,0 +1,86 @@
+package com.axlabs.neo.grantshares;
+
+import io.neow3j.devpack.Hash160;
+
+/**
+ * The base struct of a proposal created and stored when a user creates a proposal.
+ *
+ * Additional proposal information is added via the {@link ProposalData struct}.
+ */
+public class ProposalV2 {
+
+ /**
+ * The proposals ID. IDs are assigned incrementally.
+ */
+ public int id;
+
+ /**
+ * The endorser of the proposal. Is set to null as long as the proposal is not endorsed.
+ */
+ public Hash160 endorser;
+
+ /**
+ * The actual number of votes required for this proposal to reach quorum.
+ *
+ * This is calculated at proposal creation time based on the quorum percentage and total number of members at
+ * that time.
+ */
+ public int quorumVotes;
+
+ /**
+ * The end of the review phase. Is set to zero as long as the proposal is not endorsed.
+ */
+ public int reviewEnd;
+
+ /**
+ * The end of the voting phase. Is set to zero as long as the proposal is not endorsed.
+ */
+ public int votingEnd;
+
+ /**
+ * The end of the time lock phase. Is set to zero as long as the proposal is not endorsed.
+ */
+ public int timeLockEnd;
+
+ /**
+ * The time at which this proposal expires. Expiration can happen before a proposal is endorsed or after a proposal
+ * was accepted but not yet executed.
+ */
+ public int expiration;
+
+ /**
+ * Tells if this proposal was already executed.
+ */
+ public boolean executed;
+
+ public ProposalV2(int id, int expiration) {
+ this.id = id;
+ endorser = null;
+ this.quorumVotes = 0; // Initialize to 0, will be set once endorsed.
+ reviewEnd = 0;
+ votingEnd = 0;
+ timeLockEnd = 0;
+ this.expiration = expiration;
+ executed = false;
+ }
+
+ public ProposalV2(ProposalV1 proposalV1) {
+ this.id = proposalV1.id;
+ this.endorser = proposalV1.endorser;
+ this.quorumVotes = 0; // Initialize to 0, will be set once endorsed.
+ this.reviewEnd = proposalV1.reviewEnd;
+ this.votingEnd = proposalV1.votingEnd;
+ this.timeLockEnd = proposalV1.timeLockEnd;
+ this.expiration = proposalV1.expiration;
+ this.executed = proposalV1.executed;
+ }
+
+ public void calculateAndSetQuorumVotes(int quorum, int memberCount) {
+ if (quorumVotes == 0) {
+ quorumVotes = (memberCount * quorum) / 100;
+ if ((memberCount * quorum) % 100 != 0) {
+ quorumVotes += 1; // Round up
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/axlabs/neo/grantshares/ProposalVotes.java b/src/main/java/com/axlabs/neo/grantshares/ProposalVotes.java
index 24f526a..52752d7 100644
--- a/src/main/java/com/axlabs/neo/grantshares/ProposalVotes.java
+++ b/src/main/java/com/axlabs/neo/grantshares/ProposalVotes.java
@@ -34,5 +34,4 @@ public ProposalVotes() {
abstain = 0;
voters = new Map<>();
}
-
}
diff --git a/src/main/solidity/GrantSharesRelayer.sol b/src/main/solidity/GrantSharesRelayer.sol
new file mode 100644
index 0000000..3273236
--- /dev/null
+++ b/src/main/solidity/GrantSharesRelayer.sol
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.28;
+
+import {Ownable2StepUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Ownable2StepUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+
+contract GrantSharesRelayer is Ownable2StepUpgradeable, PausableUpgradeable, UUPSUpgradeable {
+ using Address for address payable;
+
+ //0xfc512fde
+ error InvalidPaymentAmount();
+
+ event CreateProposal(address indexed sender, Proposal proposal);
+
+ event ExecuteProposal(uint256 indexed proposalId);
+
+ event ProposalFeeUpdated(uint256 fee);
+
+ event ExecutionFeeUpdated(uint256 fee);
+
+ /// @custom:storage-location erc7201:grantshares.storage
+ struct GSStorage {
+ uint256 proposalFee;
+ uint256 executionFee;
+ }
+
+ struct Proposal {
+ bytes intents;
+ string offchainUri;
+ uint256 linkedProposal;
+ }
+
+ //keccak256(abi.encode(uint256(keccak256("grantshares.storage")) - 1)) & ~bytes32(uint256(0xff))
+ bytes32 private constant GSStorageLocation = 0xbf1dcdeffa40dfe9cfe080762b5d715a0ec98727df31130b368e7f82f0d49800;
+
+ /// @custom:oz-upgrades-unsafe-allow constructor
+ constructor() {
+ _disableInitializers();
+ }
+
+ /**
+ * @dev Initializes the contract with the sender as the default admin role
+ * @param initialOwner Address of the initial owner
+ * @param proposalFee Fee required to create a proposal
+ * @param executionFee Fee required to execute a proposal
+ */
+ function initialize(address initialOwner, uint256 proposalFee, uint256 executionFee) public initializer {
+ __Ownable_init(initialOwner);
+ _getGSStorage().proposalFee = proposalFee;
+ _getGSStorage().executionFee = executionFee;
+ }
+
+ /**
+ * @dev Creates a proposal event with the proposal data
+ * This function requires an ETH payment as a fee, in order to create a proposal
+ * @param proposal Proposal to be created
+ */
+ function propose(Proposal calldata proposal) external payable whenNotPaused {
+ if (_getGSStorage().proposalFee != msg.value) revert InvalidPaymentAmount();
+ emit CreateProposal(msg.sender, proposal);
+ }
+
+ /**
+ * @dev Executes a proposal
+ * This function requires an ETH payment as a fee, in order to execute a proposal
+ * @param proposalId Id of the proposal to be executed
+ */
+ function execute(uint256 proposalId) external payable whenNotPaused {
+ if (_getGSStorage().executionFee != msg.value) revert InvalidPaymentAmount();
+ emit ExecuteProposal(proposalId);
+ }
+
+ /**
+ * @dev Sets the fee required to create a proposal
+ * @param fee Fee to be paid to create a proposal
+ */
+ function setProposalFee(uint256 fee) external onlyOwner {
+ _getGSStorage().proposalFee = fee;
+ emit ProposalFeeUpdated(fee);
+ }
+
+ /**
+ * @dev Sets the fee required to execute a proposal
+ * @param fee Fee to be paid to execute a proposal
+ */
+ function setExecutionFee(uint256 fee) external onlyOwner {
+ _getGSStorage().executionFee = fee;
+ emit ExecutionFeeUpdated(fee);
+ }
+
+ /**
+ * @dev Returns the fee required to create a proposal
+ * @return Fee required to create a proposal
+ */
+ function getFees() external pure returns (GSStorage memory) {
+ return _getGSStorage();
+ }
+
+ /**
+ * @dev Withdraws the fees accumulated in the contract to the owner's address
+ */
+ function withdrawFees() external onlyOwner {
+ // no reentrancy guard b/c owner is trusted
+ payable(owner()).sendValue(address(this).balance);
+ }
+
+ /**
+ * @dev Pauses the contract
+ */
+ function pause() external onlyOwner {
+ _pause();
+ }
+
+ /**
+ * @dev Unpauses the contract
+ */
+ function unpause() external onlyOwner {
+ _unpause();
+ }
+
+ function _authorizeUpgrade(address) internal override onlyOwner {}
+
+ function _getGSStorage() private pure returns (GSStorage storage $) {
+ assembly {
+ $.slot := GSStorageLocation
+ }
+ }
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java b/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
index f50c3fc..fddcc35 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GovernanceMembersTest.java
@@ -10,6 +10,7 @@
import io.neow3j.test.DeployConfig;
import io.neow3j.test.DeployConfiguration;
import io.neow3j.transaction.AccountSigner;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.CallFlags;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash256;
@@ -26,19 +27,18 @@
import java.util.List;
import java.util.stream.Collectors;
-import static com.axlabs.neo.grantshares.util.TestHelper.ADD_MEMBER;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CALC_MEMBER_MULTI_SIG_ACC;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.DENISE;
-import static com.axlabs.neo.grantshares.util.TestHelper.GET_MEMBERS;
-import static com.axlabs.neo.grantshares.util.TestHelper.MEMBER_ADDED;
-import static com.axlabs.neo.grantshares.util.TestHelper.MEMBER_REMOVED;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.PROPOSAL_EXECUTED;
-import static com.axlabs.neo.grantshares.util.TestHelper.REMOVE_MEMBER;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.MEMBER_ADDED;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.MEMBER_REMOVED;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PROPOSAL_EXECUTED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.ADD_MEMBER;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.CALC_MEMBER_MULTI_SIG_ACC;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.GET_MEMBERS;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.REMOVE_MEMBER;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.createMultiSigAccount;
import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
@@ -52,6 +52,8 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
batchFile = "setup.batch")
@@ -79,7 +81,6 @@ public static DeployConfiguration deployConfig() throws Exception {
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
alice = ext.getAccount(ALICE);
bob = ext.getAccount(BOB);
@@ -89,10 +90,11 @@ public static void setUp() throws Throwable {
//region ADD MEMBER
@Test
- public void fail_calling_add_member_directly() throws Throwable {
- Hash256 tx = gov.invokeFunction(ADD_MEMBER, hash160(bob)).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Method only callable by the contract itself", neow3j);
+ public void fail_calling_add_member_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(ADD_MEMBER, hash160(bob)).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
}
@Order(1) // Is executed before the execute_remove_member test which removes bob from members.
@@ -105,7 +107,8 @@ public void execute_add_member() throws Throwable {
gov.getScriptHash(),
ADD_MEMBER,
array(publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String offchainUri = "execute_add_member";
// 1. Create and endorse proposal
@@ -118,8 +121,8 @@ public void execute_add_member() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign().send()
- .getSendRawTransaction().getHash();
+ Hash256 tx = gov.execute(id).signers(
+ AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
@@ -129,7 +132,8 @@ public void execute_add_member() throws Throwable {
assertThat(returnVals.get(0).getValue(), is(nullValue()));
assertThat(execution.getNotifications().get(0).getEventName(), is(MEMBER_ADDED));
assertThat(execution.getNotifications().get(0).getState().getList().get(0).getAddress(),
- is(bob.getAddress()));
+ is(bob.getAddress())
+ );
assertThat(execution.getNotifications().get(1).getEventName(), is(PROPOSAL_EXECUTED));
List newMembers = gov.getMembers();
@@ -138,7 +142,8 @@ public void execute_add_member() throws Throwable {
bob.getECKeyPair().getPublicKey(),
charlie.getECKeyPair().getPublicKey(),
alice.getECKeyPair().getPublicKey(),
- denise.getECKeyPair().getPublicKey()));
+ denise.getECKeyPair().getPublicKey()
+ ));
assertThat(gov.getMembersCount(), is(4));
}
@@ -149,7 +154,8 @@ public void fail_execute_add_member_with_already_member() throws Throwable {
gov.getScriptHash(),
ADD_MEMBER,
array(publicKey(alice.getECKeyPair().getPublicKey().getEncoded(true))),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_execute_add_member_with_already_member";
// 1. Create and endorse proposal
@@ -160,9 +166,10 @@ public void fail_execute_add_member_with_already_member() throws Throwable {
voteForProposal(gov, neow3j, id, charlie);
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Already a member", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Already a member"));
}
@Test
@@ -173,7 +180,8 @@ public void fail_execute_add_member_with_invalid_public_key() throws Throwable {
gov.getScriptHash(),
ADD_MEMBER,
array(publicKey(invalidPubKey)),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_execute_add_member_with_invalid_public_key";
// 1. Create and endorse proposal
@@ -192,10 +200,12 @@ public void fail_execute_add_member_with_invalid_public_key() throws Throwable {
//region REMOVE MEMBER
@Test
- public void fail_calling_remove_member_directly() throws Throwable {
- Hash256 tx = gov.invokeFunction(REMOVE_MEMBER, hash160(bob)).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Method only callable by the contract itself", neow3j);
+ public void fail_calling_remove_member_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(REMOVE_MEMBER, hash160(bob)).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
}
@Order(2) // Is executed right after the execute_add_member test to remove bob from members
@@ -207,7 +217,8 @@ public void execute_remove_member() throws Throwable {
gov.getScriptHash(),
REMOVE_MEMBER,
array(publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String offchainUri = "execute_remove_member";
// 1. Create and endorse proposal
@@ -220,8 +231,8 @@ public void execute_remove_member() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign().send()
- .getSendRawTransaction().getHash();
+ Hash256 tx = gov.execute(id).signers(
+ AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
@@ -231,7 +242,8 @@ public void execute_remove_member() throws Throwable {
assertThat(returnVals.get(0).getValue(), is(nullValue()));
assertThat(execution.getNotifications().get(0).getEventName(), is(MEMBER_REMOVED));
assertThat(execution.getNotifications().get(0).getState().getList().get(0).getAddress(),
- is(bob.getAddress()));
+ is(bob.getAddress())
+ );
assertThat(execution.getNotifications().get(1).getEventName(), is(PROPOSAL_EXECUTED));
List newMembers = gov.getMembers();
@@ -239,7 +251,8 @@ public void execute_remove_member() throws Throwable {
assertThat(newMembers, containsInAnyOrder(
charlie.getECKeyPair().getPublicKey(),
alice.getECKeyPair().getPublicKey(),
- denise.getECKeyPair().getPublicKey()));
+ denise.getECKeyPair().getPublicKey()
+ ));
}
@Test
@@ -249,7 +262,8 @@ public void fail_execute_remove_member_with_non_member() throws Throwable {
gov.getScriptHash(),
REMOVE_MEMBER,
array(publicKey(acc.getECKeyPair().getPublicKey().getEncoded(true))),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_execute_remove_member_with_non_member";
// 1. Create and endorse proposal
@@ -260,9 +274,10 @@ public void fail_execute_remove_member_with_non_member() throws Throwable {
voteForProposal(gov, neow3j, id, charlie);
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not a member", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not a member"));
}
//endregion REMOVE MEMBER
@@ -275,7 +290,8 @@ public void get_members() throws IOException {
assertThat(members, contains(
alice.getECKeyPair().getPublicKey().getEncoded(true),
charlie.getECKeyPair().getPublicKey().getEncoded(true),
- denise.getECKeyPair().getPublicKey().getEncoded(true)));
+ denise.getECKeyPair().getPublicKey().getEncoded(true)
+ ));
}
@Test
diff --git a/src/test/java/com/axlabs/neo/grantshares/GovernanceMigrationTest.java b/src/test/java/com/axlabs/neo/grantshares/GovernanceMigrationTest.java
deleted file mode 100644
index daa824d..0000000
--- a/src/test/java/com/axlabs/neo/grantshares/GovernanceMigrationTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import com.axlabs.neo.grantshares.util.GrantSharesGovContract;
-import com.axlabs.neo.grantshares.util.IntentParam;
-import com.axlabs.neo.grantshares.util.ProposalStruct;
-import com.axlabs.neo.grantshares.util.TestHelper;
-import io.neow3j.compiler.CompilationUnit;
-import io.neow3j.compiler.Compiler;
-import io.neow3j.protocol.Neow3j;
-import io.neow3j.protocol.core.response.NeoApplicationLog;
-import io.neow3j.protocol.core.stackitem.StackItem;
-import io.neow3j.test.ContractTest;
-import io.neow3j.test.ContractTestExtension;
-import io.neow3j.test.DeployConfig;
-import io.neow3j.test.DeployConfiguration;
-import io.neow3j.transaction.AccountSigner;
-import io.neow3j.types.CallFlags;
-import io.neow3j.types.ContractParameter;
-import io.neow3j.types.Hash256;
-import io.neow3j.utils.Await;
-import io.neow3j.wallet.Account;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EXPIRATION_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.VOTING_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
-import static io.neow3j.types.ContractParameter.array;
-import static io.neow3j.types.ContractParameter.hash160;
-import static io.neow3j.types.ContractParameter.integer;
-import static io.neow3j.types.ContractParameter.publicKey;
-import static io.neow3j.types.ContractParameter.string;
-import static java.util.Arrays.asList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
-@ContractTest(contracts = GrantSharesGovOld.class, blockTime = 1, configFile = "default.neo-express",
- batchFile = "setup.batch")
-public class GovernanceMigrationTest {
-
- @RegisterExtension
- private static ContractTestExtension ext = new ContractTestExtension();
-
- private static Neow3j neow3j;
- private static GrantSharesGovContract gov;
- private static Account alice; // Set to be a DAO member.
- private static Account bob; // Set to be a DAO member.
- private static Account charlie;
-
- @DeployConfig(GrantSharesGovOld.class)
- public static DeployConfiguration deployConfig() throws Exception {
- DeployConfiguration config = new DeployConfiguration();
- config.setDeployParam(prepareDeployParameter(ext.getAccount(ALICE), ext.getAccount(BOB)));
- return config;
- }
-
- @BeforeAll
- public static void setUp() throws Throwable {
- neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
- gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGovOld.class).getScriptHash(), neow3j);
- alice = ext.getAccount(ALICE);
- bob = ext.getAccount(BOB);
- charlie = ext.getAccount(CHARLIE);
-
- ContractParameter intent1 = array(hash160(gov.getScriptHash()), string("addMember"),
- array(publicKey(bob.getECKeyPair().getPublicKey())));
- ContractParameter intent2 = array(hash160(gov.getScriptHash()), string("changeParam"),
- array(VOTING_LENGTH_KEY, 100));
- Hash256 txHash = gov.createProposal(alice.getScriptHash(), "proposal1", -1, intent1, intent2)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- Await.waitUntilTransactionIsExecuted(txHash, neow3j);
- txHash = gov.createProposal(alice.getScriptHash(), "proposal2", -1, intent1)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- Await.waitUntilTransactionIsExecuted(txHash, neow3j);
- }
-
- @Test
- public void updateContractAndMigrateStorage() throws Throwable {
- List proposal = gov.callInvokeFunction("getProposal", asList(integer(0)))
- .getInvocationResult().getStack().get(0).getList();
- List intent = proposal.get(11).getList();
- assertThat(intent.size(), is(2)); // two intents in the first proposal
- // the intents have 3 attributes (no CallFlags yet)
- assertThat(proposal.get(11).getList().get(0).getList().size(), is(3));
- assertThat(gov.getParameter(EXPIRATION_LENGTH_KEY).getInteger().intValue(), is(PHASE_LENGTH * 1000));
-
- CompilationUnit res = new Compiler().compile(GrantSharesGov.class.getCanonicalName());
- final int newExpirationLength = 120 * 1000; // milliseconds
- ContractParameter i = IntentParam.updateContractProposal(gov.getScriptHash(),
- res.getNefFile(),
- res.getManifest(),
- array(EXPIRATION_LENGTH_KEY, newExpirationLength));
-
- int id = TestHelper.createAndEndorseProposal(gov, neow3j, charlie, alice, array(i), "updateContract");
- ext.fastForwardOneBlock(PHASE_LENGTH);
- TestHelper.voteForProposal(gov, neow3j, id, alice);
- ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.none(bob)).sign().send().getSendRawTransaction().getHash();
- Await.waitUntilTransactionIsExecuted(tx, neow3j);
-
- ProposalStruct p = gov.getProposal(0);
- assertThat(p.intents.size(), is(2));
- assertThat(p.intents.get(0).callFlags, is((int) CallFlags.ALL.getValue()));
-
- p = gov.getProposal(1);
- assertThat(p.intents.size(), is(1));
- assertThat(p.intents.get(0).callFlags, is((int) CallFlags.ALL.getValue()));
-
- p = gov.getProposal(id);
- assertThat(p.intents.size(), is(1));
- assertThat(p.intents.get(0).callFlags, is((int) CallFlags.ALL.getValue()));
-
- assertThat(gov.getParameter(EXPIRATION_LENGTH_KEY).getInteger().intValue(), is(newExpirationLength));
-
- List notifications = neow3j.getApplicationLog(tx).send()
- .getApplicationLog().getExecutions().get(0).getNotifications();
- List migratedEvents = notifications.stream()
- .filter(n -> n.getEventName().equals("ProposalMigrated")).collect(Collectors.toList());
- assertThat(migratedEvents.size(), is(3));
- assertThat(migratedEvents.get(0).getState().getList().get(0).getInteger().intValue(), is(0));
- assertThat(migratedEvents.get(1).getState().getList().get(0).getInteger().intValue(), is(1));
- assertThat(migratedEvents.get(2).getState().getList().get(0).getInteger().intValue(), is(2));
- }
-}
diff --git a/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java b/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
index a253aa4..bccb32f 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GovernanceParametersTest.java
@@ -10,6 +10,7 @@
import io.neow3j.test.DeployConfig;
import io.neow3j.test.DeployConfiguration;
import io.neow3j.transaction.AccountSigner;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash256;
import io.neow3j.utils.Await;
@@ -23,24 +24,23 @@
import java.util.List;
import java.util.Map;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHANGE_PARAM;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EXPIRATION_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_ACCEPTANCE_RATE;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_ACCEPTANCE_RATE_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_QUORUM;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_QUORUM_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.MULTI_SIG_THRESHOLD_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.MULTI_SIG_THRESHOLD_RATIO;
-import static com.axlabs.neo.grantshares.util.TestHelper.PARAMETER_CHANGED;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.PROPOSAL_EXECUTED;
-import static com.axlabs.neo.grantshares.util.TestHelper.REVIEW_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.TIMELOCK_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.VOTING_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PARAMETER_CHANGED;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PROPOSAL_EXECUTED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.CHANGE_PARAM;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.EXPIRATION_LENGTH_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.MIN_ACCEPTANCE_RATE_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.MIN_QUORUM_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.MULTI_SIG_THRESHOLD_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.REVIEW_LENGTH_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.TIMELOCK_LENGTH_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.VOTING_LENGTH_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.MIN_ACCEPTANCE_RATE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.MIN_QUORUM;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.MULTI_SIG_THRESHOLD_RATIO;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
import static com.axlabs.neo.grantshares.util.TestHelper.voteForProposal;
@@ -50,6 +50,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
batchFile = "setup.batch")
@@ -75,7 +77,6 @@ public static DeployConfiguration deployConfig() throws Exception {
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
alice = ext.getAccount(ALICE);
bob = ext.getAccount(BOB);
@@ -137,10 +138,12 @@ public void execute_change_parameter() throws Throwable {
}
@Test
- public void fail_calling_change_parameter_directly() throws Throwable {
- Hash256 tx = gov.invokeFunction(CHANGE_PARAM, string(REVIEW_LENGTH_KEY), integer(100))
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Method only callable by the contract itself", neow3j);
+ public void fail_calling_change_parameter_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(CHANGE_PARAM, string(REVIEW_LENGTH_KEY), integer(100)).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
}
@Test
@@ -158,9 +161,10 @@ public void fail_changing_unknown_parameter() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Unknown parameter", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Unknown parameter"));
}
@Test
@@ -176,9 +180,10 @@ public void fail_changing_voting_length_to_negative_value() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid parameter value", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid parameter value"));
assertThat(gov.getParameter(VOTING_LENGTH_KEY).getInteger().intValue(), is(PHASE_LENGTH * 1000));
}
@@ -195,9 +200,10 @@ public void fail_changing_min_acceptance_rate_to_negative_value() throws Throwab
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid parameter value", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid parameter value"));
assertThat(gov.getParameter(MIN_ACCEPTANCE_RATE_KEY).getInteger().intValue(), is(MIN_ACCEPTANCE_RATE));
}
@@ -214,9 +220,10 @@ public void fail_changing_min_acceptance_rate_to_more_than_hundred() throws Thro
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid parameter value", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid parameter value"));
assertThat(gov.getParameter(MIN_ACCEPTANCE_RATE_KEY).getInteger().intValue(), is(MIN_ACCEPTANCE_RATE));
}
@@ -233,9 +240,10 @@ public void fail_changing_multisig_threshold_to_zero() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid parameter value", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid parameter value"));
assertThat(gov.getParameter(MULTI_SIG_THRESHOLD_KEY).getInteger().intValue(), is(MULTI_SIG_THRESHOLD_RATIO));
}
@@ -252,9 +260,10 @@ public void fail_changing_multisig_threshold_to_more_than_hundred() throws Throw
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid parameter value", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid parameter value"));
assertThat(gov.getParameter(MULTI_SIG_THRESHOLD_KEY).getInteger().intValue(), is(MULTI_SIG_THRESHOLD_RATIO));
}
diff --git a/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
index 640026d..86d0ccc 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovTest.java
@@ -13,6 +13,7 @@
import io.neow3j.protocol.core.response.InvocationResult;
import io.neow3j.protocol.core.response.NeoApplicationLog;
import io.neow3j.protocol.core.response.NeoInvokeFunction;
+import io.neow3j.protocol.core.response.Notification;
import io.neow3j.protocol.core.stackitem.StackItem;
import io.neow3j.test.ContractTest;
import io.neow3j.test.ContractTestExtension;
@@ -21,6 +22,7 @@
import io.neow3j.transaction.AccountSigner;
import io.neow3j.transaction.Transaction;
import io.neow3j.transaction.Witness;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.CallFlags;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash160;
@@ -39,32 +41,20 @@
import java.math.BigInteger;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Collections;
import java.util.List;
-import static com.axlabs.neo.grantshares.util.TestHelper.ADD_MEMBER;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHANGE_PARAM;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.CREATE;
-import static com.axlabs.neo.grantshares.util.TestHelper.ENDORSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EXECUTE;
-import static com.axlabs.neo.grantshares.util.TestHelper.GET_PROPOSAL;
-import static com.axlabs.neo.grantshares.util.TestHelper.GET_PROPOSAL_COUNT;
-import static com.axlabs.neo.grantshares.util.TestHelper.IS_PAUSED;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_ACCEPTANCE_RATE;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_ACCEPTANCE_RATE_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_QUORUM;
-import static com.axlabs.neo.grantshares.util.TestHelper.PAUSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.PROPOSAL_CREATED;
-import static com.axlabs.neo.grantshares.util.TestHelper.PROPOSAL_ENDORSED;
-import static com.axlabs.neo.grantshares.util.TestHelper.REMOVE_MEMBER;
-import static com.axlabs.neo.grantshares.util.TestHelper.UNPAUSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.UPDATE_CONTRACT;
-import static com.axlabs.neo.grantshares.util.TestHelper.VOTE;
-import static com.axlabs.neo.grantshares.util.TestHelper.VOTED;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PROPOSAL_CREATED;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PROPOSAL_ENDORSED;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.VOTED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.*;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.MIN_ACCEPTANCE_RATE_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.MIN_ACCEPTANCE_RATE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.MIN_QUORUM;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.createMultiSigAccount;
import static com.axlabs.neo.grantshares.util.TestHelper.createSimpleProposal;
@@ -86,6 +76,7 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
@@ -94,8 +85,9 @@
public class GrantSharesGovTest {
@RegisterExtension
- private static ContractTestExtension ext = new ContractTestExtension();
-
+ private static final ContractTestExtension ext = new ContractTestExtension();
+ private final static Path TESTCONTRACT_NEF_FILE = Paths.get("TestContract.nef");
+ private final static Path TESTCONTRACT_MANIFEST_FILE = Paths.get("TestGrantSharesGov.manifest.json");
private static Neow3j neow3j;
private static GrantSharesGovContract gov;
private static Account alice; // Set to be a DAO member.
@@ -103,37 +95,30 @@ public class GrantSharesGovTest {
private static Account charlie; // Set to be a DAO member.
private static int defaultProposalId;
- private final static Path TESTCONTRACT_NEF_FILE = Paths.get("TestContract.nef");
- private final static Path TESTCONTRACT_MANIFEST_FILE =
- Paths.get("TestGrantSharesGov.manifest.json");
-
@DeployConfig(GrantSharesGov.class)
public static DeployConfiguration deployConfig() throws Exception {
DeployConfiguration config = new DeployConfiguration();
- config.setDeployParam(prepareDeployParameter(
- ext.getAccount(ALICE), ext.getAccount(CHARLIE)));
+ config.setDeployParam(prepareDeployParameter(ext.getAccount(ALICE), ext.getAccount(CHARLIE)));
return config;
}
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
alice = ext.getAccount(ALICE);
bob = ext.getAccount(BOB);
charlie = ext.getAccount(CHARLIE);
Hash256 creationTx = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()),
- array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- integer(CallFlags.ALL.getValue()))),
- string("default_proposal"),
- integer(-1))
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ integer(CallFlags.ALL.getValue())
+ )), string("default_proposal"), integer(-1)
+ ).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- defaultProposalId = neow3j.getApplicationLog(creationTx).send().getApplicationLog()
- .getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ defaultProposalId = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(
+ 0).getStack().get(0).getInteger().intValue();
}
@Test
@@ -145,20 +130,18 @@ public void succeed_creating_and_retrieving_proposal() throws Throwable {
Hash160 targetParam1 = gov.getScriptHash();
Hash160 targetParam2 = alice.getScriptHash();
int targetParam3 = 1;
- ContractParameter intent = array(targetContract, targetMethod,
- array(targetParam1, targetParam2, targetParam3), integer(CallFlags.ALL.getValue()));
+ ContractParameter intent = array(targetContract, targetMethod, array(targetParam1, targetParam2, targetParam3),
+ integer(CallFlags.ALL.getValue())
+ );
String offchainUri = "offchainUri of the proposal";
- Hash256 proposalCreationTx = gov.invokeFunction(CREATE,
- hash160(alice.getScriptHash()),
- array(intent),
- string(offchainUri),
- integer(-1)) // no linked proposal
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 proposalCreationTx = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()), array(intent),
+ string(offchainUri), integer(-1)
+ ) // no linked proposal
+ .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(proposalCreationTx, neow3j);
- int id = neow3j.getApplicationLog(proposalCreationTx).send()
- .getApplicationLog().getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(proposalCreationTx).send().getApplicationLog().getExecutions().get(
+ 0).getStack().get(0).getInteger().intValue();
// 2. Test correct setup of the created proposal.
NeoInvokeFunction r = gov.callInvokeFunction(GET_PROPOSAL, asList(integer(id)));
@@ -179,11 +162,10 @@ public void succeed_creating_and_retrieving_proposal() throws Throwable {
assertThat(p.intents.get(0).params.get(2).getInteger().intValue(), is(targetParam3));
// 3. Test CreateProposal event values
- List ntfs =
- neow3j.getApplicationLog(proposalCreationTx).send().getApplicationLog()
- .getExecutions().get(0).getNotifications();
+ List ntfs = neow3j.getApplicationLog(
+ proposalCreationTx).send().getApplicationLog().getExecutions().get(0).getNotifications();
- NeoApplicationLog.Execution.Notification ntf = ntfs.get(0);
+ Notification ntf = ntfs.get(0);
assertThat(ntf.getEventName(), is(PROPOSAL_CREATED));
List state = ntf.getState().getList();
assertThat(state.get(0).getInteger().intValue(), is(id));
@@ -194,46 +176,62 @@ public void succeed_creating_and_retrieving_proposal() throws Throwable {
@Test
@Order(0)
- public void fail_creating_with_missing_linked_proposal() throws Throwable {
+ public void fail_creating_with_missing_linked_proposal() {
ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
- array(gov.getScriptHash(), alice.getScriptHash(), 1));
+ array(gov.getScriptHash(), alice.getScriptHash(), 1)
+ );
String offchainUri = "fail_creating_with_missing_linked_proposal";
- Hash256 tx = gov.createProposal(alice.getScriptHash(), offchainUri, 1000, intent)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Linked proposal doesn't exist", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), offchainUri, 1000, intent).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Linked proposal doesn't exist"));
}
@Test
@Order(0)
- public void fail_creating_with_bad_quorum() throws Throwable {
+ public void fail_creating_with_bad_quorum() {
ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
- array(gov.getScriptHash(), alice.getScriptHash(), 1));
+ array(gov.getScriptHash(), alice.getScriptHash(), 1)
+ );
String offchainUri = "fail_creating_with_bad_quorum";
- Hash256 tx = gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, MIN_QUORUM - 1,
- intent).signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid quorum", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, MIN_QUORUM - 1,
+ intent
+ ).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid quorum"));
- tx = gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, 101, intent)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid quorum", neow3j);
+ e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE, 101,
+ intent
+ ).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid quorum"));
}
@Test
@Order(0)
- public void fail_creating_with_bad_acceptance_rate() throws Throwable {
+ public void fail_creating_with_bad_acceptance_rate() {
ContractParameter intent = array(NeoToken.SCRIPT_HASH, "transfer",
- array(gov.getScriptHash(), alice.getScriptHash(), 1));
+ array(gov.getScriptHash(), alice.getScriptHash(), 1)
+ );
String offchainUri = "fail_creating_with_bad_acceptance_rate";
- Hash256 tx = gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE - 1, MIN_QUORUM,
- intent).signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid acceptance rate", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, MIN_ACCEPTANCE_RATE - 1, MIN_QUORUM,
+ intent
+ ).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid acceptance rate"));
- tx = gov.createProposal(alice.getScriptHash(), offchainUri, -1, 101, MIN_QUORUM, intent)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid acceptance rate", neow3j);
+ e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), offchainUri, -1, 101, MIN_QUORUM, intent).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid acceptance rate"));
}
@Test
@@ -242,8 +240,8 @@ public void succeed_endorsing_with_member() throws Throwable {
// 1. Create a proposal
Hash256 creationTx = createSimpleProposal(gov, alice, "succeed_endorsing_with_member");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send()
- .getApplicationLog().getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
// 2. Test that proposal endorser and phases have not yet been setup.
ProposalStruct p = gov.getProposal(id);
@@ -252,12 +250,12 @@ public void succeed_endorsing_with_member() throws Throwable {
assertThat(p.votingEnd, is(BigInteger.ZERO));
assertThat(p.timelockEnd, is(BigInteger.ZERO));
assertThat(p.expiration, is(greaterThan(BigInteger.ZERO)));
+ assertThat(p.quorumVotes, is(0));
+ assertThat(p.quorum, is(MIN_QUORUM));
// 3. Endorse
- Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id),
- hash160(alice.getScriptHash()))
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id), hash160(alice.getScriptHash())).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(endorseTx, neow3j);
// 4. Test the right setup of the proposal phases
@@ -277,9 +275,21 @@ public void succeed_endorsing_with_member() throws Throwable {
assertThat(p.reject, is(0));
assertThat(p.abstain, is(0));
- // 6. Test emitted "endorsed" event
- NeoApplicationLog.Execution.Notification ntf = neow3j.getApplicationLog(endorseTx).send()
- .getApplicationLog().getExecutions().get(0).getNotifications().get(0);
+ //6. Test the correct quorum votes are stored
+ int memberCount = gov.callInvokeFunction(GET_MEMBERS_COUNT)
+ .getInvocationResult()
+ .getStack()
+ .get(0)
+ .getInteger()
+ .intValue();
+ ProposalStruct proposal = gov.getProposal(id);
+ // round up the expected quorum votes
+ int expectedQuorumVotes = (memberCount * proposal.quorum + 99) / 100;
+ assertThat(proposal.quorumVotes, is(expectedQuorumVotes));
+
+ // 7. Test emitted "endorsed" event
+ Notification ntf = neow3j.getApplicationLog(endorseTx).send().getApplicationLog().getExecutions().get(
+ 0).getNotifications().get(0);
assertThat(ntf.getEventName(), is(PROPOSAL_ENDORSED));
List state = ntf.getState().getList();
assertThat(state.get(0).getInteger().intValue(), is(id));
@@ -288,18 +298,22 @@ public void succeed_endorsing_with_member() throws Throwable {
@Test
@Order(0)
- public void fail_endorsing_with_non_member() throws Throwable {
- Hash256 tx = gov.endorseProposal(defaultProposalId, bob.getScriptHash())
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_endorsing_with_non_member() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(defaultProposalId, bob.getScriptHash()).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
- public void fail_endorsing_with_member_but_wrong_signer() throws Throwable {
- Hash256 tx = gov.endorseProposal(defaultProposalId, alice.getScriptHash())
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_endorsing_with_member_but_wrong_signer() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(defaultProposalId, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@@ -308,26 +322,30 @@ public void fail_endorsing_already_endorsed_proposal() throws Throwable {
// 1. Create a proposal
Hash256 creationTx = createSimpleProposal(gov, alice, "fail_endorsing_already_endorsed_proposal");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack()
- .get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
// 2. Endorse
- Hash256 endorseTx = gov.endorseProposal(id, alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 endorseTx = gov.endorseProposal(id, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(endorseTx, neow3j);
// 3. Endorse again
- Hash256 tx = gov.endorseProposal(id, alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal already endorsed", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(id, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal already endorsed"));
}
@Test
@Order(0)
- public void fail_endorsing_non_existent_proposal() throws Throwable {
- Hash256 tx = gov.endorseProposal(1000, alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal doesn't exist", neow3j);
+ public void fail_endorsing_non_existent_proposal() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(1000, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
}
@Test
@@ -335,13 +353,15 @@ public void fail_endorsing_non_existent_proposal() throws Throwable {
public void fail_endorsing_expired_proposal() throws Throwable {
Hash256 creationTx = createSimpleProposal(gov, bob, "fail_endorsing_expired_proposal");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send()
- .getApplicationLog().getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
ext.fastForwardOneBlock(PHASE_LENGTH);
- Hash256 tx = gov.endorseProposal(id, alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal expired", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(id, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal expired"));
}
@Test
@@ -350,24 +370,20 @@ public void succeed_voting() throws Throwable {
// 1. Create proposal
Hash256 creationTx = createSimpleProposal(gov, bob, "succeed_voting");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send()
- .getApplicationLog().getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
// 2. Endorse
- Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id),
- hash160(alice.getScriptHash()))
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id), hash160(alice.getScriptHash())).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(endorseTx, neow3j);
// 3. Wait till review phase ends.
ext.fastForwardOneBlock(PHASE_LENGTH);
// 4. Vote
- Hash256 voteTx = gov.invokeFunction(VOTE, integer(id), integer(-1),
- hash160(charlie.getScriptHash()))
- .signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 voteTx = gov.invokeFunction(VOTE, integer(id), integer(-1), hash160(charlie.getScriptHash())).signers(
+ AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(voteTx, neow3j);
// 5. Test the right setting of the votes
@@ -379,8 +395,8 @@ public void succeed_voting() throws Throwable {
assertThat(proposal.voters.get(charlie.getAddress()), is(-1));
// 6. Test the emitted vote event
- NeoApplicationLog.Execution.Notification ntf = neow3j.getApplicationLog(voteTx).send()
- .getApplicationLog().getExecutions().get(0).getNotifications().get(0);
+ Notification ntf = neow3j.getApplicationLog(voteTx).send().getApplicationLog().getExecutions().get(
+ 0).getNotifications().get(0);
assertThat(ntf.getEventName(), is(VOTED));
List state = ntf.getState().getList();
assertThat(state.get(0).getInteger().intValue(), is(id));
@@ -393,28 +409,28 @@ public void succeed_voting() throws Throwable {
public void fail_voting_in_review_and_queued_phase() throws Throwable {
Hash256 creationTx = createSimpleProposal(gov, bob, "fail_voting_in_review_and_queued_phase");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions()
- .get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
// 2. Endorse
- Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id),
- hash160(alice.getScriptHash()))
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id), hash160(alice.getScriptHash())).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(endorseTx, neow3j);
// 3. Vote in review phase
- Hash256 tx = gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal not active", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal not active"));
// 5. Fast-forward till after the voting phase.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 4. Vote in queued or later phase
- tx = gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal not active", neow3j);
+ e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(id, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal not active"));
}
@Test
@@ -422,30 +438,27 @@ public void fail_voting_in_review_and_queued_phase() throws Throwable {
public void fail_voting_multiple_times() throws Throwable {
Hash256 creationTx = createSimpleProposal(gov, bob, "fail_voting_multiple_times");
Await.waitUntilTransactionIsExecuted(creationTx, neow3j);
- int id = neow3j.getApplicationLog(creationTx).send()
- .getApplicationLog().getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(creationTx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
// 2. Endorse
- Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id),
- hash160(alice.getScriptHash()))
- .signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 endorseTx = gov.invokeFunction(ENDORSE, integer(id), hash160(alice.getScriptHash())).signers(
+ AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(endorseTx, neow3j);
// 3. Fast-forward to the voting phase.
ext.fastForwardOneBlock(PHASE_LENGTH);
// 4. Vote the first time
- Hash256 voteTx = gov.invokeFunction(VOTE, integer(id), integer(-1),
- hash160(charlie.getScriptHash()))
- .signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 voteTx = gov.invokeFunction(VOTE, integer(id), integer(-1), hash160(charlie.getScriptHash())).signers(
+ AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(voteTx, neow3j);
// 5. Vote the second time
- Hash256 tx = gov.vote(id, 1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Already voted on this proposal", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(id, 1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Already voted on this proposal"));
// 6. Check votes
ProposalStruct proposal = gov.getProposal(id);
@@ -458,37 +471,44 @@ public void fail_voting_multiple_times() throws Throwable {
@Test
@Order(0)
- public void fail_voting_with_non_member() throws Throwable {
+ public void fail_voting_with_non_member() {
// Vote on the default proposal. Doesn't matter in what phase it is.
- Hash256 tx = gov.vote(defaultProposalId, -1, bob.getScriptHash()).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(defaultProposalId, -1, bob.getScriptHash()).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
- public void fail_voting_on_non_existent_proposal() throws Throwable {
- Hash256 tx = gov.vote(1000, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
- .send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal doesn't exist", neow3j);
+ public void fail_voting_on_non_existent_proposal() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(1000, -1, charlie.getScriptHash()).signers(AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
}
@Test
@Order(0)
- public void fail_voting_on_not_endorsed_proposal() throws Throwable {
+ public void fail_voting_on_not_endorsed_proposal() {
// Vote on the default proposal. Doesn't matter in what phase it is.
- Hash256 tx = gov.vote(defaultProposalId, -1, charlie.getScriptHash())
- .signers(AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal not active", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(defaultProposalId, -1, charlie.getScriptHash()).signers(
+ AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal not active"));
}
@Test
@Order(0)
- public void fail_voting_with_invalid_vote() throws Throwable {
+ public void fail_voting_with_invalid_vote() {
// Vote on the default proposal. Doesn't matter in what phase it is.
- Hash256 tx = gov.vote(defaultProposalId, 2, charlie.getScriptHash())
- .signers(AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid vote", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(defaultProposalId, 2, charlie.getScriptHash()).signers(
+ AccountSigner.calledByEntry(charlie)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid vote"));
}
@Test
@@ -497,71 +517,74 @@ public void create_proposal_with_large_intents_and_offchainUri() throws Throwabl
String offchainUri =
"aabcababcababcababcabbcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcaabcabcabcabcabcabca";
Hash256 tx = gov.invokeFunction(CREATE, hash160(bob),
- array(
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
- "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
- array(
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash())
- ), CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
- "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
- array(
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash())
- ), CallFlags.ALL.getValue()),
- array(NeoToken.SCRIPT_HASH, "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
- "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
- array(
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- new Hash160(defaultAccountScriptHash()),
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfiojpasodm" +
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
- "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi"
- ), CallFlags.ALL.getValue())
+ array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
),
- string(offchainUri),
- integer(-1))
- .signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ), array(NeoToken.SCRIPT_HASH,
+ "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
+ "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
+ array(new Hash160(defaultAccountScriptHash()), new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash())
+ ), CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH,
+ "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
+ "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
+ array(new Hash160(defaultAccountScriptHash()), new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash())
+ ), CallFlags.ALL.getValue()
+ ),
+ array(NeoToken.SCRIPT_HASH,
+ "jjsldfjklkasjdfkljalkjasdf;lkjasddfd" +
+ "lfjkasdflkjasdfssldfjklkasjdfkljasasdfasfasdfasdf",
+ array(new Hash160(defaultAccountScriptHash()), new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ new Hash160(defaultAccountScriptHash()),
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfiojpasodm" +
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi" +
+ "hlksajdfiojasdofjasodjflkjasdkfjlaijsdfi"
+ ),
+ CallFlags.ALL.getValue()
+ )
+ ), string(offchainUri), integer(-1)
+ ).signers(
+ AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
- int id = neow3j.getApplicationLog(tx).send().getApplicationLog().getExecutions().get(0)
- .getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(tx).send().getApplicationLog().getExecutions().get(0).getStack().get(
+ 0).getInteger().intValue();
- NeoInvokeFunction r = gov.callInvokeFunction(GET_PROPOSAL, asList(integer(id)));
+ NeoInvokeFunction r = gov.callInvokeFunction(GET_PROPOSAL, Collections.singletonList(integer(id)));
ProposalStruct p = new ProposalStruct(r.getInvocationResult().getStack().get(0).getList());
assertThat(p.id, is(id));
assertThat(p.proposer, is(bob.getScriptHash()));
@@ -577,11 +600,11 @@ public void create_proposal_with_large_intents_and_offchainUri() throws Throwabl
public void succeed_creating_exact_same_proposal_that_already_exists() throws IOException {
// Recreate default proposal
InvocationResult result = gov.invokeFunction(CREATE, hash160(alice.getScriptHash()),
- array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue())),
- string("default_proposal"),
- integer(-1)).signers(AccountSigner.calledByEntry(alice))
- .callInvokeScript().getInvocationResult();
+ array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ )), string("default_proposal"), integer(-1)
+ ).signers(
+ AccountSigner.calledByEntry(alice)).callInvokeScript().getInvocationResult();
assertThat(result.getStack().get(0).getInteger().intValue(), is(not(defaultProposalId)));
assertThat(result.getStack().get(0).getInteger().intValue(), is(greaterThan(0)));
}
@@ -589,8 +612,10 @@ public void succeed_creating_exact_same_proposal_that_already_exists() throws IO
@Test
@Order(0)
public void get_proposals() throws Throwable {
- ContractParameter intents = array(array(NeoToken.SCRIPT_HASH, "balanceOf",
- array(new Hash160(defaultAccountScriptHash())), CallFlags.ALL.getValue()));
+ ContractParameter intents = array(
+ array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ ));
TestHelper.createAndEndorseProposal(gov, neow3j, bob, alice, intents, "some_proposal");
ProposalPaginatedStruct page = gov.getProposals(0, 1);
@@ -603,187 +628,197 @@ public void get_proposals() throws Throwable {
proposal = gov.getProposals(1, 1).items.get(0);
assertThat(proposal.id, is(greaterThanOrEqualTo(1)));
- String exception = gov.callInvokeFunction("getProposals", asList(integer(-1), integer(1)))
- .getInvocationResult().getException();
+ String exception = gov.callInvokeFunction("getProposals",
+ asList(integer(-1), integer(1))
+ ).getInvocationResult().getException();
assertThat(exception, containsString("Page number was negative"));
- exception = gov.callInvokeFunction("getProposals", asList(integer(0), integer(0)))
- .getInvocationResult().getException();
+ exception = gov.callInvokeFunction("getProposals",
+ asList(integer(0), integer(0))
+ ).getInvocationResult().getException();
assertThat(exception, containsString("Page number was negative or zero"));
}
@Test
@Order(0)
public void get_number_of_proposals() throws IOException {
- int result = gov.callInvokeFunction(GET_PROPOSAL_COUNT)
- .getInvocationResult().getStack().get(0).getInteger().intValue();
+ int result = gov.callInvokeFunction(GET_PROPOSAL_COUNT).getInvocationResult().getStack().get(
+ 0).getInteger().intValue();
// At least one because of the default proposal from the setup method.
assertThat(result, is(greaterThanOrEqualTo(1)));
}
@Test
@Order(0)
- public void fail_pausing_contract_without_members_account() throws Throwable {
- Hash256 tx = gov.invokeFunction(PAUSE).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorized", neow3j);
+ public void fail_pausing_contract_without_members_account() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(PAUSE).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorized"));
}
@Test
@Order(0)
- public void fail_unpausing_contract_without_members_account() throws Throwable {
- Hash256 tx = gov.invokeFunction(UNPAUSE).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorized", neow3j);
+ public void fail_unpausing_contract_without_members_account() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(UNPAUSE).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorized"));
}
// Is executed as the first test of series of test that require the contract to be paused.
@Order(10)
@Test
public void succeed_pausing_contract() throws Throwable {
- assertFalse(gov.callInvokeFunction(IS_PAUSED).getInvocationResult()
- .getStack().get(0).getBoolean());
+ assertFalse(gov.callInvokeFunction(IS_PAUSED).getInvocationResult().getStack().get(0).getBoolean());
Account membersAccount = createMultiSigAccount(1, alice, charlie);
- Transaction tx = gov.invokeFunction(PAUSE)
- .signers(AccountSigner.none(bob), AccountSigner.calledByEntry(membersAccount))
- .getUnsignedTransaction();
- Hash256 txHash = tx
- .addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair()))
- .addMultiSigWitness(membersAccount.getVerificationScript(), alice)
- .send().getSendRawTransaction().getHash();
+ Transaction tx = gov.invokeFunction(PAUSE).signers(AccountSigner.none(bob),
+ AccountSigner.calledByEntry(membersAccount)
+ ).getUnsignedTransaction();
+ Hash256 txHash = tx.addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair())).addMultiSigWitness(
+ membersAccount.getVerificationScript(), alice).send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(txHash, neow3j);
- assertTrue(gov.callInvokeFunction(IS_PAUSED).getInvocationResult()
- .getStack().get(0).getBoolean());
+ assertTrue(gov.callInvokeFunction(IS_PAUSED).getInvocationResult().getStack().get(0).getBoolean());
}
@Test
@Order(0)
public void fail_execute_update_contract_directly() throws Throwable {
- File nefFile = new File(this.getClass().getClassLoader()
- .getResource(TESTCONTRACT_NEF_FILE.toString()).toURI());
+ File nefFile = new File(this.getClass().getClassLoader().getResource(TESTCONTRACT_NEF_FILE.toString()).toURI());
NefFile nef = NefFile.readFromFile(nefFile);
- File manifestFile = new File(this.getClass().getClassLoader()
- .getResource(TESTCONTRACT_MANIFEST_FILE.toString()).toURI());
- ContractManifest manifest = getObjectMapper()
- .readValue(manifestFile, ContractManifest.class);
+ File manifestFile = new File(
+ this.getClass().getClassLoader().getResource(TESTCONTRACT_MANIFEST_FILE.toString()).toURI());
+ ContractManifest manifest = getObjectMapper().readValue(manifestFile, ContractManifest.class);
String manifestString = getObjectMapper().writeValueAsString(manifest);
- Hash256 tx = gov.updateContract(nef.toArray(), manifestString, null).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Method only callable by the contract itself", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.updateContract(nef.toArray(), manifestString, null).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Method only callable by the contract itself"));
}
@Test
@Order(0)
- public void fail_create_proposal_calling_contract_management() throws Throwable {
+ public void fail_create_proposal_calling_contract_management() {
IntentParam intent1 = IntentParam.addMemberProposal(gov.getScriptHash(), alice.getECKeyPair().getPublicKey());
IntentParam intent2 = new IntentParam(ContractManagement.SCRIPT_HASH, "destroy");
- Hash256 tx = gov.createProposal(alice.getScriptHash(), "fail_create_proposal_calling_contract_management", -1,
- intent1, intent2).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid intents", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.createProposal(alice.getScriptHash(), "fail_create_proposal_calling_contract_management", -1,
+ intent1, intent2
+ ).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid intents"));
}
@Order(11)
@Test
- public void fail_change_param_on_paused_contract() throws Throwable {
- Hash256 tx = gov.invokeFunction(CHANGE_PARAM, string(MIN_ACCEPTANCE_RATE_KEY), integer(50))
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_change_param_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(CHANGE_PARAM, string(MIN_ACCEPTANCE_RATE_KEY), integer(50)).signers(
+ AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(12)
@Test
- public void fail_add_member_on_paused_contract() throws Throwable {
- Hash256 tx = gov.invokeFunction(ADD_MEMBER, publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true)))
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_add_member_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(ADD_MEMBER,
+ publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))
+ ).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(13)
@Test
- public void fail_remove_member_on_paused_contract() throws Throwable {
- Hash256 tx = gov.invokeFunction(REMOVE_MEMBER, publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true)))
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_remove_member_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.invokeFunction(REMOVE_MEMBER,
+ publicKey(bob.getECKeyPair().getPublicKey().getEncoded(true))
+ ).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(14)
@Test
- public void fail_execute_proposal_on_paused_contract() throws Throwable {
- Hash256 tx = gov.execute(defaultProposalId).signers(AccountSigner.calledByEntry(bob)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_execute_proposal_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(defaultProposalId).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(15)
@Test
- public void fail_vote_on_proposal_on_paused_contract() throws Throwable {
- Hash256 tx = gov.vote(defaultProposalId, 1, alice.getScriptHash()).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_vote_on_proposal_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.vote(defaultProposalId, 1, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(16)
@Test
- public void fail_endorse_proposal_on_paused_contract() throws Throwable {
- Hash256 tx = gov.endorseProposal(defaultProposalId, alice.getScriptHash())
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_endorse_proposal_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.endorseProposal(defaultProposalId, alice.getScriptHash()).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(17)
@Test
- public void fail_update_contract_on_paused_contract() throws Throwable {
- Hash256 tx = gov.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null)
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_update_contract_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null).signers(
+ AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
// Must be executed after all tests orderd after the test that pauses the contract.
@Order(19)
@Test
public void succeed_unpausing_contract() throws Throwable {
- assertTrue(gov.callInvokeFunction(IS_PAUSED).getInvocationResult()
- .getStack().get(0).getBoolean());
+ assertTrue(gov.callInvokeFunction(IS_PAUSED).getInvocationResult().getStack().get(0).getBoolean());
Account membersAccount = createMultiSigAccount(1, alice, charlie);
- Transaction tx = gov.invokeFunction(UNPAUSE)
- .signers(AccountSigner.none(bob), AccountSigner.calledByEntry(membersAccount))
- .getUnsignedTransaction();
- Hash256 txHash = tx
- .addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair()))
- .addMultiSigWitness(membersAccount.getVerificationScript(), alice)
- .send().getSendRawTransaction().getHash();
+ Transaction tx = gov.invokeFunction(UNPAUSE).signers(AccountSigner.none(bob),
+ AccountSigner.calledByEntry(membersAccount)
+ ).getUnsignedTransaction();
+ Hash256 txHash = tx.addWitness(Witness.create(tx.getHashData(), bob.getECKeyPair())).addMultiSigWitness(
+ membersAccount.getVerificationScript(), alice).send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(txHash, neow3j);
- assertFalse(gov.callInvokeFunction(IS_PAUSED).getInvocationResult()
- .getStack().get(0).getBoolean());
+ assertFalse(gov.callInvokeFunction(IS_PAUSED).getInvocationResult().getStack().get(0).getBoolean());
}
@Test
@Order(20)
public void execute_proposal_with_update_contract() throws Throwable {
- File nefFile = new File(this.getClass().getClassLoader()
- .getResource(TESTCONTRACT_NEF_FILE.toString()).toURI());
+ File nefFile = new File(this.getClass().getClassLoader().getResource(TESTCONTRACT_NEF_FILE.toString()).toURI());
NefFile nef = NefFile.readFromFile(nefFile);
- File manifestFile = new File(this.getClass().getClassLoader()
- .getResource(TESTCONTRACT_MANIFEST_FILE.toString()).toURI());
- ContractManifest manifest = getObjectMapper()
- .readValue(manifestFile, ContractManifest.class);
+ File manifestFile = new File(
+ this.getClass().getClassLoader().getResource(TESTCONTRACT_MANIFEST_FILE.toString()).toURI());
+ ContractManifest manifest = getObjectMapper().readValue(manifestFile, ContractManifest.class);
byte[] manifestBytes = getObjectMapper().writeValueAsBytes(manifest);
ContractParameter data = string("some data");
ContractParameter intents = array(
- array(
- gov.getScriptHash(),
- UPDATE_CONTRACT,
- array(nef.toArray(), manifestBytes, data),
+ array(gov.getScriptHash(), UPDATE_CONTRACT, array(nef.toArray(), manifestBytes, data),
CallFlags.ALL.getValue()
));
String offchainUri = "execute_proposal_with_update_contract";
@@ -798,16 +833,14 @@ public void execute_proposal_with_update_contract() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.invokeFunction(EXECUTE, integer(id))
- .signers(AccountSigner.calledByEntry(charlie))
- .sign().send().getSendRawTransaction().getHash();
+ Hash256 tx = gov.invokeFunction(EXECUTE, integer(id)).signers(
+ AccountSigner.calledByEntry(charlie)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
- NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
- .getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ NeoApplicationLog.Execution execution = neow3j.getApplicationLog(
+ tx).send().getApplicationLog().getExecutions().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("UpdatingContract"));
assertThat(n.getContract(), is(gov.getScriptHash()));
}
-
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovUpdateTest.java b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovUpdateTest.java
new file mode 100644
index 0000000..a2dbd90
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/GrantSharesGovUpdateTest.java
@@ -0,0 +1,256 @@
+package com.axlabs.neo.grantshares;
+
+import com.axlabs.neo.grantshares.util.GrantSharesGovContract;
+import com.axlabs.neo.grantshares.util.IntentParam;
+import com.axlabs.neo.grantshares.util.ProposalPaginatedStruct;
+import com.axlabs.neo.grantshares.util.ProposalStruct;
+import com.axlabs.neo.grantshares.util.TestHelper;
+import io.neow3j.compiler.CompilationUnit;
+import io.neow3j.compiler.Compiler;
+import io.neow3j.contract.ContractManagement;
+import io.neow3j.contract.NefFile;
+import io.neow3j.contract.SmartContract;
+import io.neow3j.crypto.Base64;
+import io.neow3j.protocol.Neow3j;
+import io.neow3j.protocol.ObjectMapperFactory;
+import io.neow3j.protocol.core.response.ContractManifest;
+import io.neow3j.protocol.core.response.NeoApplicationLog;
+import io.neow3j.protocol.core.stackitem.StackItem;
+import io.neow3j.test.ContractTest;
+import io.neow3j.test.ContractTestExtension;
+import io.neow3j.transaction.AccountSigner;
+import io.neow3j.transaction.TransactionBuilder;
+import io.neow3j.types.CallFlags;
+import io.neow3j.types.ContractParameter;
+import io.neow3j.types.Hash160;
+import io.neow3j.types.Hash256;
+import io.neow3j.types.NeoVMStateType;
+import io.neow3j.types.StackItemType;
+import io.neow3j.wallet.Account;
+import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.CREATE;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.GET_MEMBERS_COUNT;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static io.neow3j.types.ContractParameter.array;
+import static io.neow3j.types.ContractParameter.hash160;
+import static io.neow3j.types.ContractParameter.integer;
+import static io.neow3j.types.ContractParameter.publicKey;
+import static io.neow3j.types.ContractParameter.string;
+import static io.neow3j.utils.Await.waitUntilTransactionIsExecuted;
+import static java.util.Arrays.asList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+@ContractTest(contracts = {}, blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class GrantSharesGovUpdateTest {
+
+ static final Path TEST_MANIFEST_FILE = Paths.get("src/test/resources/GrantSharesGov.manifest.json");
+ static final String REVIEW_LENGTH_KEY = "review_len";
+ static final String VOTING_LENGTH_KEY = "voting_len";
+ static final String TIMELOCK_LENGTH_KEY = "timelock_len";
+ static final String EXPIRATION_LENGTH_KEY = "expiration_len";
+ static final String MIN_ACCEPTANCE_RATE_KEY = "min_accept_rate";
+ static final String MIN_QUORUM_KEY = "min_quorum";
+ static final String THRESHOLD_KEY = "threshold";
+
+ static final int VOTING_LENGTH = 10000;
+ static final int TIMELOCK_LENGTH = 10000;
+
+ @RegisterExtension
+ private static final ContractTestExtension ext = new ContractTestExtension();
+
+ private static Neow3j neow3j;
+ private static GrantSharesGovContract gov;
+ private static Account alice;
+ private static Account charlie;
+
+ @BeforeAll
+ public static void setUp() throws Throwable {
+ neow3j = ext.getNeow3j();
+ alice = ext.getAccount(ALICE);
+ charlie = ext.getAccount(CHARLIE);
+
+ NefFile nefFile = getNefFile();
+ ContractManifest manifest = getContractManifest();
+
+ List members = asList(publicKey(alice.getECKeyPair().getPublicKey()));
+ ContractParameter deployConfig = array(
+ members,
+ array(
+ REVIEW_LENGTH_KEY, 0,
+ VOTING_LENGTH_KEY, VOTING_LENGTH,
+ TIMELOCK_LENGTH_KEY, TIMELOCK_LENGTH,
+ EXPIRATION_LENGTH_KEY, 2592000000L,
+ MIN_ACCEPTANCE_RATE_KEY, 50,
+ MIN_QUORUM_KEY, 50,
+ THRESHOLD_KEY, 75
+ )
+ );
+
+ TransactionBuilder builder = new ContractManagement(neow3j)
+ .deploy(nefFile, manifest, deployConfig)
+ .signers(AccountSigner.none(alice));
+ Hash256 txHash = builder.sign().send().getSendRawTransaction().getHash();
+
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ Hash160 contractHash = SmartContract.calcContractHash(
+ alice.getScriptHash(), nefFile.getCheckSumAsInteger(), manifest.getName()
+ );
+ gov = new GrantSharesGovContract(contractHash, neow3j);
+ // Verify that the deployed contract's nef checksum is exactly the same as the contract we'd like to update.
+ assertThat(neow3j.getContractState(gov.getScriptHash()).send().getContractState().getNef().getChecksum(),
+ is(1180315207L)
+ );
+
+ // Create two proposals to test the migration logic:
+ // First proposal - will be endorsed before update
+ ContractParameter intents1 = array(array(gov.getScriptHash(), "changeParam",
+ array(string("min_accept_rate"), integer(60)), CallFlags.ALL.getValue()
+ ));
+ int id = TestHelper.createAndEndorseProposal(gov, neow3j, charlie, alice, intents1, "proposal1");
+ // Get old style endorser to validate
+ List list = gov.callInvokeFunction("getProposal", asList(integer(id))).getInvocationResult()
+ .getStack().get(0).getList();
+
+ StackItem stackItem = list.get(5);
+ assertThat(stackItem.getType(), is(StackItemType.BYTE_STRING));
+ assertThat(Hash160.fromAddress(stackItem.getAddress()), is(alice.getScriptHash()));
+
+ // Second proposal - will remain unendorsed until after update
+ ContractParameter intents2 = array(array(gov.getScriptHash(), "changeParam",
+ array(string("min_quorum"), integer(55)), CallFlags.ALL.getValue()
+ ));
+ Hash256 tx = gov.invokeFunction(CREATE, hash160(charlie), intents2, string("proposal2"), integer(-1))
+ .signers(AccountSigner.calledByEntry(charlie))
+ .sign()
+ .send()
+ .getSendRawTransaction()
+ .getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+ }
+
+ private static ContractManifest getContractManifest() throws IOException {
+ ContractManifest manifest;
+ try (FileInputStream s = new FileInputStream(TEST_MANIFEST_FILE.toFile())) {
+ manifest = ObjectMapperFactory.getObjectMapper().readValue(s, ContractManifest.class);
+ }
+ return manifest;
+ }
+
+ private static @NotNull NefFile getNefFile() {
+ String compiler = "neow3j-3.17.1";
+ String sourceUrl =
+ "https://github.com/AxLabs/grantshares-contracts/blob/main/src/main/java/com/axlabs/neo/grantshares" +
+ "/GrantSharesGov.java";
+ NefFile.MethodToken methodToken1 = new NefFile.MethodToken(
+ new Hash160("0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"),
+ "deserialize",
+ 1, true, CallFlags.ALL
+ );
+ NefFile.MethodToken methodToken2 = new NefFile.MethodToken(
+ new Hash160("0xacce6fd80d44e1796aa0c2c625e9e4e0ce39efc0"),
+ "serialize",
+ 1, true, CallFlags.ALL
+ );
+ NefFile.MethodToken methodToken3 = new NefFile.MethodToken(
+ new Hash160("0xfffdc93764dbaddd97c48f252a53ea4643faa3fd"),
+ "update",
+ 3, false, CallFlags.ALL
+ );
+ String nefBase64 = "VwkCeSXGAAAAeHBoEc5xEHJqacovMQAAAGlqznNpahGeznRrbFA1tg0AAFhrbBJNEc5Ri1EQzkHmPxiEahKeciPR" +
+ "////aBDOcmrKOWpza8p0EHVtbC83AAAAa23Odm5KStkoUNkwrFDKACGzqzlZbkHPmYcCbhJNEc5Ri1EQzkHmPxiEbZx1I8z" +
+ "///9aDAkjX21lbWJlcnNqylNB5j8YhFoMBnBhdXNlZBBTQeY/GIRaDAsjX3Byb3Bvc2FscxBTQeY/GIQj" +
+ "+wAAAFsSUEoRzlAQzkHfMLiacGhBnAjtnCepAAAAaEHzVL8dcWkQzkrYJgM42yFyaRHONwAAc8J0axTOdW3KdhB3B28Hbi8uAAAAbW8HzncIbBTDSm8IEM5vCBHObwgSzh8VVTU/EQAAz28HnHcHI9T///8Ww0prEM5rEc5rEs5rE85saxXOF1U1MhEAAHVbam03AQASTRHOUYtREM5B5j8YhGoRwAwQUHJvcG9zYWxNaWdyYXRlZEGVAW9hI1b///94cRByamnKLzEAAABpas5zaWoRns50a2xQNTsMAABYa2wSTRHOUYtREM5B5j8YhGoSnnIj0f///0BXAAFYeEsRzlCLUBDOQZJd6DFAVwMAWBJQShHOUBDOQd8wuJpwyHFoQZwI7ZwnGQAAAGhB81S/HXJpahDOahHO0CPm////aUBXAwEAEcNKNZMQAABwaHgQUNBbeEsRzlCLUBDOQZJd6DFxadglOQAAAGk3AAByaGoQzhFQ0GhqEc4SUNBoahLOE1DQaGoTzhRQ0GhqFM4bUNBoahXOHFDQIwcAAAALQFx4SxHOUItQEM5Bkl3oMXFp2CU0AAAAaTcAAHJoahHOFVDQaGoSzhZQ0GhqE84XUNBoahTOGFDQaGoVzhlQ0GhqFs4aUNBdeEsRzlCLUBDOQZJd6DFxadglJgAAAGk3AAByaGoQzh1Q0GhqEc4eUNBoahLOH1DQaGoTziBQ0GhAVwIAWRRQShHOUBDOQd8wuJpwwnFoQZwI7ZwnEgAAAGloQfNUvx3PI+3///9pQEH2tGviDAkjX21lbWJlcnNQQZJd6DHbIUBB9rRr4gwLI19wcm9wb3NhbHNQQZJd6DHbIUBXBAJ4EC8+AAAADDZbR3JhbnRTaGFyZXNHb3YuZ2V0UHJvcG9zYWxzXSBQYWdlIG51bWJlciB3YXMgbmVnYXRpdmU6eRAtRgAAAAw+W0dyYW50U2hhcmVzR292LmdldFByb3Bvc2Fsc10gUGFnZSBudW1iZXIgd2FzIG5lZ2F0aXZlIG9yIHplcm86Qfa0a+IMCyNfcHJvcG9zYWxzUEGSXegx2yFwaHh5UzWzDgAAccJyaRDOc2tpEc4vFQAAAGprNf79///Pa5xzI+z///8Tw0p4aRLOalQ1Bw8AAEBB9rRr4gwGcGF1c2VkUEGSXegx2yBANREAAAA1pf7//1BBajPpCUBXBABB9rRr4gwJI19tZW1iZXJzUEGSXegx2yFwWAwJdGhyZXNob2xkSxHOUItQEM5Bkl3oMdshcWhpoHJqAGShc2oAZKInCAAAAGucc2slTwAAAAxHW0dyYW50U2hhcmVzR292LmNhbGNNZW1iZXJzTXVsdGlTaWdBY2NvdW50VGhyZXNob2xkXSBUaHJlc2hvbGQgd2FzIHplcm86a0BXAAR4eXp7WAwPbWluX2FjY2VwdF9yYXRlSxHOUItQEM5Bkl3oMdshWAwKbWluX3F1b3J1bUsRzlCLUBDOQZJd6DHbIRZVNQYAAABAVwIGeEH4J+yMJSsAAAAMDk5vdCBhdXRob3Jpc2VkDA5jcmVhdGVQcm9wb3NhbFA16gwAAHxYDA9taW5fYWNjZXB0X3JhdGVLEc5Qi1AQzkGSXegx2yExDQAAAHwAZDM0AAAADBdJbnZhbGlkIGFjY2VwdGFuY2UgcmF0ZQwOY3JlYXRlUHJvcG9zYWxQNYwMAAB9WAwKbWluX3F1b3J1bUsRzlCLUBDOQZJd6DHbITENAAAAfQBkMysAAAAMDkludmFsaWQgcXVvcnVtDA5jcmVhdGVQcm9wb3NhbFA1PAwAAHsQMU8AAABce0sRzlCLUBDOQZJd6DHYJzoAAAAMHUxpbmtlZCBwcm9wb3NhbCBkb2Vzbid0IGV4aXN0DA5jcmVhdGVQcm9wb3NhbFA16wsAAHk1BQEAACUsAAAADA9JbnZhbGlkIGludGVudHMMDmNyZWF0ZVByb3Bvc2FsUDW5CwAAQfa0a+IMCyNfcHJvcG9zYWxzUEGSXegx2yFwWAwOZXhwaXJhdGlvbl9sZW5LEc5Qi1AQzkGSXegx2yFBt8OIA55xXGgXw0poaVM1UwwAADcBABJNEc5Ri1EQzkHmPxiEW2gWw0p4e3x9eXoXVTV1CwAANwEAEk0RzlGLURDOQeY/GIRdaBTDSjU8DAAANwEAEk0RzlGLURDOQeY/GIRaDAsjX3Byb3Bvc2Fsc2gRnlNB5j8YhGh4fH1UFMAMD1Byb3Bvc2FsQ3JlYXRlZEGVAW9haEBXBAF4cGjKcRByamkviAAAAGhqznNrEM5KStkoUNkwrFDKABSzqydkAAAAaxDODBQAAAAAAAAAAAAAAAAAAAAAAAAAAJclRQAAAGsQzgwU/aP6Q0bqUyolj8SX3a3bZDfJ/f+XJSYAAABrEc7YJR0AAABrEc4MAJclEgAAAGsTzhEBAAG7JQcAAAAQQGqcciN7////EUBXAgI1AwoAAFl5SxHOUItQEM5Bkl3oMdglEAAAAHlB+CfsjCUsAAAADA5Ob3QgYXV0aG9yaXNlZAwPZW5kb3JzZVByb3Bvc2FsUDUACgAAXHhLEc5Qi1AQzkGSXegxcGjYJzQAAAAMFlByb3Bvc2FsIGRvZXNuJ3QgZXhpc3QMD2VuZG9yc2VQcm9wb3NhbFA1ugkAAGg3AABxaRXOQbfDiAMtLgAAAAwQUHJvcG9zYWwgZXhwaXJlZAwPZW5kb3JzZVByb3Bvc2FsUDV/CQAAaRHO2CU3AAAADBlQcm9wb3NhbCBhbHJlYWR5IGVuZG9yc2VkDA9lbmRvcnNlUHJvcG9zYWxQNUQJAABpeRFQ0GlBt8OIA1gMCnJldmlld19sZW5LEc5Qi1AQzkGSXegx2yGeElDQaWkSzlgMCnZvdGluZ19sZW5LEc5Qi1AQzkGSXegx2yGeE1DQaWkTzlgMDHRpbWVsb2NrX2xlbksRzlCLUBDOQZJd6DHbIZ4UUNBpaRTOWAwOZXhwaXJhdGlvbl9sZW5LEc5Qi1AQzkGSXegx2yGeFVDQXHhpNwEAEk0RzlGLURDOQeY/GIR4eVASwAwQUHJvcG9zYWxFbmRvcnNlZEGVAW9hQFcEAzUqCAAAeQ8xDAAAAHkRMx8AAAAMDEludmFsaWQgdm90ZQwEdm90ZVA1RggAAFl6SxHOUItQEM5Bkl3oMdglEAAAAHpB+CfsjCUhAAAADA5Ob3QgYXV0aG9yaXNlZAwEdm90ZVA1CggAAFx4SxHOUItQEM5Bkl3oMXBo2CcpAAAADBZQcm9wb3NhbCBkb2Vzbid0IGV4aXN0DAR2b3RlUDXPBwAAaDcAAHFBt8OIA3JpEc7YJRcAAABqaRLOMQ4AAABqaRPOMSYAAAAME1Byb3Bvc2FsIG5vdCBhY3RpdmUMBHZvdGVQNYgHAABdeEsRzlCLUBDOQZJd6DE3AABzaxPOessnMQAAAAweQWxyZWFkeSB2b3RlZCBvbiB0aGlzIHByb3Bvc2FsDAR2b3RlUDU/BwAAaxPOennQeRAvEwAAAGtKEc4RnhFQ0CMjAAAAeRAzEwAAAGtKEM4RnhBQ0CMOAAAAa0oSzhGeElDQXXhrNwEAEk0RzlGLURDOQeY/GIR4enlTE8AMBVZvdGVkQZUBb2FAVwkBNZMGAABceEsRzlCLUBDOQZJd6DFwaNgnLAAAAAwWUHJvcG9zYWwgZG9lc24ndCBleGlzdAwHZXhlY3V0ZVA1mQYAAGg3AABxaRHO2CUSAAAAQbfDiANpFM4vNQAAAAwfUHJvcG9zYWwgbm90IGluIGV4ZWN1dGlvbiBwaGFzZQwHZXhlY3V0ZVA1TgYAAGkWzicvAAAADBlQcm9wb3NhbCBhbHJlYWR5IGV4ZWN1dGVkDAdleGVjdXRlUDUcBgAAaRXOQbfDiAMtJgAAAAwQUHJvcG9zYWwgZXhwaXJlZAwHZXhlY3V0ZVA17gUAAFt4SxHOUItQEM5Bkl3oMTcAAHJdeEsRzlCLUBDOQZJd6DE3AABzaxDOaxLOnmsRzp50bABkoEH2tGviDAkjX21lbWJlcnNQQZJd6DHbIaFqE84vKAAAAAwSUXVvcnVtIG5vdCByZWFjaGVkDAdleGVjdXRlUDV0BQAAaxDOaxHOnnVtJxUAAABrEM4AZKBtoWoSzi0nAAAADBFQcm9wb3NhbCByZWplY3RlZAwHZXhlY3V0ZVA1NAUAAGkRFlDQahTOysN2XHhpNwEAEk0RzlGLURDOQeY/GIQQdwdvB2oUzsovMQAAAGoUzm8HzncIbm8HbwgQzm8IEc5vCBPObwgSzlRBYn1bUtBvB5x3ByPO////eBHADBBQcm9wb3NhbEV4ZWN1dGVkQZUBb2FuQFcAAjVzBAAANRIEAAB4eVA1MwAAAFh4eRJNEc5Ri1EQzkHmPxiEeHlQEsAMEFBhcmFtZXRlckNoYW5nZWRBlQFvYUBXAgJ4cGgMCnJldmlld19sZW6XJYYAAABoDAp2b3RpbmdfbGVulyVzAAAAaAwMdGltZWxvY2tfbGVulyVeAAAAaAwOZXhwaXJhdGlvbl9sZW6XJUcAAABoDA9taW5fYWNjZXB0X3JhdGWXJWcAAABoDAptaW5fcXVvcnVtlyVUAAAAaAwJdGhyZXNob2xklyWCAAAAI70AAAB5EC/cAAAADBdJbnZhbGlkIHBhcmFtZXRlciB2YWx1ZQwLY2hhbmdlUGFyYW1QNbADAAAjqwAAAHkQMQ0AAAB5AGQznAAAAAwXSW52YWxpZCBwYXJhbWV0ZXIgdmFsdWUMC2NoYW5nZVBhcmFtUDVwAwAAI2sAAAB5EDMNAAAAeQBkM1wAAAAMF0ludmFsaWQgcGFyYW1ldGVyIHZhbHVlDAtjaGFuZ2VQYXJhbVA1MAMAACMrAAAADBFVbmtub3duIHBhcmFtZXRlcgwLY2hhbmdlUGFyYW1QNQUDAABAVwEBNbgCAAA1VwIAAHhBz5mHAnBZaEsRzlCLUBDOQZJd6DHYJSgAAAAMEEFscmVhZHkgYSBtZW1iZXIMCWFkZE1lbWJlclA1uAIAAFloeBJNEc5Ri1EQzkHmPxiEWgwJI19tZW1iZXJzQfa0a+IMCSNfbWVtYmVyc1BBkl3oMdshEZ5TQeY/GIRoEcAMC01lbWJlckFkZGVkQZUBb2FAVwEBNRkCAAA1uAEAAHhBz5mHAnBZaEsRzlCLUBDOQZJd6DHYJycAAAAMDE5vdCBhIG1lbWJlcgwMcmVtb3ZlTWVtYmVyUDUaAgAAWWhLEc5Qi1AQzkEvWMXtWgwJI19tZW1iZXJzQfa0a+IMCSNfbWVtYmVyc1BBkl3oMdshEZ9TQeY/GIRoEcAMDU1lbWJlclJlbW92ZWRBlQFvYUBXAAM1ewEAADUaAQAAEMAMEFVwZGF0aW5nQ29udHJhY3RBlQFvYXh5elM3AgBAVwIAC3A8FAAAAAAAAAA1cfP//3AjFAAAAHFpDAVwYXVzZVA1cQEAAGhB+CfsjCUiAAAADA5Ob3QgYXV0aG9yaXplZAwFcGF1c2VQNUkBAABaDAZwYXVzZWQRU0HmPxiEEMAMDkNvbnRyYWN0UGF1c2VkQZUBb2FAVwIAC3A8FAAAAAAAAAA1+fL//3AjFAAAAHFpDAVwYXVzZVA1+QAAAGhB+CfsjCUkAAAADA5Ob3QgYXV0aG9yaXplZAwHdW5wYXVzZVA1zwAAAFoMBnBhdXNlZBBTQeY/GIQQwAwQQ29udHJhY3RVbnBhdXNlZEGVAW9hQEE5U248Qdv+qHSXJVAAAAAMK01ldGhvZCBvbmx5IGNhbGxhYmxlIGJ5IHRoZSBjb250cmFjdCBpdHNlbGYMFmFib3J0SWZDYWxsZXJJc05vdFNlbGZQNUoAAABAQfa0a+IMBnBhdXNlZFBBkl3oMdsgJy4AAAAMEkNvbnRyYWN0IGlzIHBhdXNlZAwNYWJvcnRJZlBhdXNlZFA1BgAAAEBXAAJ4eVASwAwFRXJyb3JBlQFvYThAVwAFeHkQUNB4ehFQ0Hh7ElDQeHwTUNBAVwAHeHkQUNB4ehFQ0Hh7ElDQeHwTUNB4fRRQ0Hh+FVDQQFcAAUBXAwN4ei8MAAAAEXAjHAAAAHh6oiUOAAAAeHqhcCMLAAAAeHqhEZ5weWgxNQAAAAwtW1BhZ2luYXRvci5jYWxjUGFnaW5hdGlvbl0gUGFnZSBvdXQgb2YgYm91bmRzOnp5oHFpep5yaXqeeDMHAAAAeHITxCFKEGnQShFq0EoSaNBAVwAEeHkQUNB4ehFQ0Hh7ElDQQFcAA3h5EFDQeAsRUNB4EBJQ0HgQE1DQeBAUUNB4ehVQ0HgQFlDQQFcAAXgQEFDQeBARUNB4EBJQ0HjIE1DQQFYSQZv2Z85iWhFQEsBkWhJQEsBjWhNQEsBlWhRQEsBgWhVQEsBhQA==";
+ byte[] nefBytes = Base64.decode(nefBase64);
+ return new NefFile(compiler, sourceUrl, asList(methodToken1, methodToken2, methodToken3), nefBytes);
+ }
+
+ @Test
+ @Order(1)
+ public void update_grant_shares_gov_contract() throws Throwable {
+ // Compile the new version of the contract
+ CompilationUnit res = new Compiler().compile(GrantSharesGov.class.getCanonicalName());
+
+ IntentParam intent = IntentParam.updateContractProposal(
+ gov.getScriptHash(), res.getNefFile(), res.getManifest()
+ );
+ // Create and endorse proposal to update the GrantSharesGov contract
+ int id = TestHelper.createAndEndorseProposal(gov, neow3j, charlie, alice, array(intent), "updateContract");
+
+ TestHelper.voteForProposal(gov, neow3j, id, alice);
+ ext.fastForwardOneBlock(VOTING_LENGTH + TIMELOCK_LENGTH);
+ Hash256 tx = gov.execute(id)
+ .signers(AccountSigner.none(charlie)).sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+
+ // Check if update was successful
+ NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx)
+ .send()
+ .getApplicationLog()
+ .getFirstExecution();
+
+ assertThat(execution.getState(), is(NeoVMStateType.HALT));
+ assertThat(execution.getNotifications().size(), is(3));
+ assertThat(execution.getNotifications().get(0).getEventName(), is("UpdatingContract"));
+
+ // Verify the contract is still functional by calling a method
+ GrantSharesGovContract updatedGov = new GrantSharesGovContract(gov.getScriptHash(), neow3j);
+ assertFalse(updatedGov.isPaused());
+
+ // Get the total number of members to calculate expected quorum votes
+ int memberCount = updatedGov.callInvokeFunction(GET_MEMBERS_COUNT)
+ .getInvocationResult()
+ .getStack()
+ .get(0)
+ .getInteger()
+ .intValue();
+
+ // Get all proposals to check their migration status
+ ProposalPaginatedStruct page = updatedGov.getProposals(0, 10);
+
+ // Check the first proposal that was endorsed before update
+ ProposalStruct proposal1 = page.items.get(0);
+ int expectedQuorumVotes = (memberCount * proposal1.quorum + 99) / 100; // Round up
+ assertThat(proposal1.quorumVotes, is(expectedQuorumVotes));
+ assertThat(proposal1.endorser, is(not(nullValue())));
+
+ // Check the second proposal that was not endorsed before update
+ ProposalStruct proposal2 = page.items.get(1);
+ assertThat(proposal2.quorumVotes, is(0));
+ assertThat(proposal2.endorser, is(nullValue()));
+
+ // Now endorse the second proposal and verify its quorumVotes gets set correctly
+ Hash256 endorseTx = updatedGov.endorseProposal(proposal2.id, alice.getScriptHash())
+ .signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ .send()
+ .getSendRawTransaction()
+ .getHash();
+ waitUntilTransactionIsExecuted(endorseTx, neow3j);
+
+ // Check that the quorumVotes was set correctly after endorsement
+ proposal2 = updatedGov.getProposal(proposal2.id);
+ expectedQuorumVotes = (memberCount * proposal2.quorum + 99) / 100; // Round up
+ assertThat(proposal2.quorumVotes, is(expectedQuorumVotes));
+ assertThat(proposal2.endorser, is(alice.getScriptHash()));
+ }
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java b/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
index c26989c..acef2f1 100644
--- a/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/GrantSharesTreasuryTest.java
@@ -12,6 +12,7 @@
import io.neow3j.protocol.core.response.ContractManifest;
import io.neow3j.protocol.core.response.InvocationResult;
import io.neow3j.protocol.core.response.NeoApplicationLog;
+import io.neow3j.protocol.core.response.Notification;
import io.neow3j.test.ContractTest;
import io.neow3j.test.ContractTestExtension;
import io.neow3j.test.DeployConfig;
@@ -20,6 +21,7 @@
import io.neow3j.transaction.AccountSigner;
import io.neow3j.transaction.Transaction;
import io.neow3j.transaction.Witness;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.CallFlags;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash160;
@@ -39,22 +41,22 @@
import java.math.BigInteger;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.DENISE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EVE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EXECUTE;
-import static com.axlabs.neo.grantshares.util.TestHelper.IS_PAUSED;
-import static com.axlabs.neo.grantshares.util.TestHelper.PAUSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.UNPAUSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.UPDATE_CONTRACT;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.EXECUTE;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.IS_PAUSED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.PAUSE;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.UNPAUSE;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.UPDATE_CONTRACT;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.EVE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.createMultiSigAccount;
import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
@@ -73,6 +75,7 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.Is.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = {GrantSharesGov.class, GrantSharesTreasury.class},
@@ -133,7 +136,6 @@ public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
// contracts
gov = new GrantSharesGovContract(
@@ -185,7 +187,9 @@ public void succeed_voting_on_committee_member() throws Throwable {
hash = neo.vote(alice, alice.getECKeyPair().getPublicKey())
.signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(hash, neow3j);
- assertThat(neo.getCandidates().get(alice.getECKeyPair().getPublicKey()).intValue(), is(1000));
+ assertThat(neo.getCandidates().stream()
+ .filter(c -> c.getPublicKey().equals(alice.getECKeyPair().getPublicKey()))
+ .findFirst().get().getVotes().intValue(), is(1000));
// fund treasury
hash = new NeoToken(neow3j).transfer(bob, treasury.getScriptHash(), BigInteger.valueOf(100))
@@ -195,39 +199,49 @@ public void succeed_voting_on_committee_member() throws Throwable {
hash = treasury.voteCommitteeMemberWithLeastVotes().signers(AccountSigner.none(bob)).sign().send()
.getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(hash, neow3j);
- assertThat(neo.getCandidates().get(alice.getECKeyPair().getPublicKey()).intValue(), is(1100));
+ assertThat(neo.getCandidates().stream()
+ .filter(c -> c.getPublicKey().equals(alice.getECKeyPair().getPublicKey()))
+ .findFirst().get().getVotes().intValue(), is(1100));
}
@Test
@Order(0)
- public void fail_calling_add_whitelisted_token_directly() throws Throwable {
- Hash256 tx = treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_calling_add_whitelisted_token_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
- public void fail_calling_remove_whitelisted_token_directly() throws Throwable {
- Hash256 tx = treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_calling_remove_whitelisted_token_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
- public void fail_calling_add_funder_directly() throws Throwable {
- Hash256 tx = treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_calling_add_funder_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
+ .signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
- public void fail_calling_remove_funder_directly() throws Throwable {
- Hash256 tx = treasury.removeFunder(charlie.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_calling_remove_funder_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.removeFunder(charlie.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@@ -254,9 +268,11 @@ public void fail_execute_update_contract_directly() throws Throwable {
ContractParameter data = string("update contract");
- Hash256 tx = treasury.invokeFunction(UPDATE_CONTRACT, byteArray(nef.toArray()), byteArray(manifestBytes), data)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.invokeFunction(UPDATE_CONTRACT, byteArray(nef.toArray()), byteArray(manifestBytes), data)
+ .signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@@ -264,7 +280,8 @@ public void fail_execute_update_contract_directly() throws Throwable {
public void fail_release_tokens_with_non_whitelisted_token() throws Throwable {
final Hash160 someToken = new Hash160("1a1512528147558851b39c2cd8aa47da7418aba1");
ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), someToken,
- alice.getScriptHash(), BigInteger.TEN);
+ alice.getScriptHash(), BigInteger.TEN
+ );
String offchainUri = "fail_release_tokens_with_non_whitelisted_token";
// 1. Create and endorse proposal
@@ -276,16 +293,18 @@ public void fail_release_tokens_with_non_whitelisted_token() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Token not whitelisted", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Token not whitelisted"));
}
@Test
@Order(0)
public void fail_release_tokens_with_to_high_amount() throws Throwable {
ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), GasToken.SCRIPT_HASH,
- alice.getScriptHash(), GAS_MAX_AMOUNT.add(BigInteger.ONE));
+ alice.getScriptHash(), GAS_MAX_AMOUNT.add(BigInteger.ONE)
+ );
String offchainUri = "fail_release_tokens_with_to_high_amount";
// 1. Create and endorse proposal
@@ -298,24 +317,29 @@ public void fail_release_tokens_with_to_high_amount() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Above token's max funding amount", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Above token's max funding amount"));
}
@Test
@Order(0)
- public void fail_calling_release_tokens_directly() throws Throwable {
- Hash256 tx = treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
- .signers(AccountSigner.calledByEntry(bob)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorised", neow3j);
+ public void fail_calling_release_tokens_directly() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
+ .signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorised"));
}
@Test
@Order(0)
public void fail_adding_invalid_funder() throws Throwable {
ContractParameter intent = new IntentParam(treasury.getScriptHash(), "addFunder",
- byteArray("3ff68d232a60f23a5805b8c40f7e61747f"), array(asList(alice.getECKeyPair().getPublicKey())));
+ byteArray("3ff68d232a60f23a5805b8c40f7e61747f"),
+ array(Collections.singletonList(alice.getECKeyPair().getPublicKey()))
+ );
String offchainUri = "fail_adding_invalid_funder";
// 1. Create and endorse proposal
@@ -327,9 +351,10 @@ public void fail_adding_invalid_funder() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid funder hash", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid funder hash"));
}
@Test
@@ -347,9 +372,10 @@ public void fail_adding_funder_with_no_public_keys() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "List of public keys is empty", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("List of public keys is empty"));
}
@Test
@@ -357,7 +383,9 @@ public void fail_adding_funder_with_no_public_keys() throws Throwable {
public void fail_adding_funder_with_invalid_public_key() throws Throwable {
IntentParam intent = new IntentParam(treasury.getScriptHash(), "addFunder", hash160(alice.getScriptHash()),
array(publicKey(alice.getECKeyPair().getPublicKey()),
- byteArray("03dab84c1243ec01ab2500e1a8c7a1546a26d734628180b0cf64e72bf776")));
+ byteArray("03dab84c1243ec01ab2500e1a8c7a1546a26d734628180b0cf64e72bf776")
+ )
+ );
String offchainUri = "fail_adding_funder_with_invalid_public_key";
// 1. Create and endorse proposal
@@ -369,9 +397,10 @@ public void fail_adding_funder_with_invalid_public_key() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid public key", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid public key"));
}
@Test
@@ -393,19 +422,22 @@ public void fail_setting_funders_multisig_threshold_ratio_with_invalid_value() t
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id1).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid threshold ratio", neow3j);
- tx = gov.execute(id2).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid threshold ratio", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id1).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid threshold ratio"));
+ e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id2).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid threshold ratio"));
}
@Test
@Order(0)
public void fail_adding_whitelisted_token_with_invalid_token() throws Throwable {
ContractParameter intent = new IntentParam(treasury.getScriptHash(), "addWhitelistedToken",
- byteArray("3ff68d232a60f23a5805b8c40f7e61747f"), integer(100));
+ byteArray("3ff68d232a60f23a5805b8c40f7e61747f"), integer(100)
+ );
String offchainUri = "fail_adding_whitelisted_token_with_invalid_token";
// 1. Create and endorse proposal
@@ -417,16 +449,18 @@ public void fail_adding_whitelisted_token_with_invalid_token() throws Throwable
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid token hash", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid token hash"));
}
@Test
@Order(0)
public void fail_adding_whitelisted_token_with_invalid_max_funding_amount() throws Throwable {
ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
- NeoToken.SCRIPT_HASH, BigInteger.ONE.negate());
+ NeoToken.SCRIPT_HASH, BigInteger.ONE.negate()
+ );
String offchainUri = "fail_adding_whitelisted_token_with_invalid_max_funding_amount";
// 1. Create and endorse proposal
@@ -438,16 +472,18 @@ public void fail_adding_whitelisted_token_with_invalid_max_funding_amount() thro
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Invalid max funding amount", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Invalid max funding amount"));
}
@Test
@Order(1)
public void execute_proposal_with_add_single_sig_funder() throws Throwable {
IntentParam intent = IntentParam.addFunderProposal(treasury.getScriptHash(), alice.getScriptHash(),
- alice.getECKeyPair().getPublicKey());
+ alice.getECKeyPair().getPublicKey()
+ );
String offchainUri = "execute_proposal_with_add_single_sig_funder";
// 1. Create and endorse proposal
@@ -466,7 +502,7 @@ public void execute_proposal_with_add_single_sig_funder() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("FunderAdded"));
Map> funders = treasury.getFunders();
@@ -481,7 +517,8 @@ public void execute_proposal_with_add_multi_sig_funder() throws Throwable {
Account multiSigFunder = Account.createMultiSigAccount(
asList(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()), 1);
IntentParam intent = IntentParam.addFunderProposal(treasury.getScriptHash(), multiSigFunder.getScriptHash(),
- denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey());
+ denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()
+ );
String offchainUri = "execute_proposal_with_add_multi_sig_funder";
// 1. Create and endorse proposal
@@ -500,7 +537,7 @@ public void execute_proposal_with_add_multi_sig_funder() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("FunderAdded"));
Map> funders = treasury.getFunders();
@@ -513,7 +550,8 @@ public void execute_proposal_with_add_multi_sig_funder() throws Throwable {
@Order(3)
public void fail_adding_already_added_funder() throws Throwable {
ContractParameter intent = IntentParam.addFunderProposal(treasury.getScriptHash(), alice.getScriptHash(),
- alice.getECKeyPair().getPublicKey());
+ alice.getECKeyPair().getPublicKey()
+ );
String offchainUri = "fail_adding_already_added_funder";
// 1. Create and endorse proposal
@@ -525,9 +563,10 @@ public void fail_adding_already_added_funder() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Already a funder", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Already a funder"));
}
@Test
@@ -552,7 +591,7 @@ public void execute_proposal_with_remove_funder() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("FunderRemoved"));
Map> funders = treasury.getFunders();
@@ -574,9 +613,10 @@ public void fail_removing_nonexistant_funder() throws Throwable {
// 3. Skip till after vote and queued phase, then execute.
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Not a funder", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not a funder"));
}
@Test
@@ -601,7 +641,7 @@ public void execute_proposal_with_remove_whitelisted_token() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("WhitelistedTokenRemoved"));
Map tokens = treasury.getWhitelistedTokens();
@@ -621,7 +661,8 @@ public void fail_funding_treasury_with_non_whitelisted_token() throws Throwable
@Order(12)
public void execute_proposal_with_add_whitelisted_token() throws Throwable {
ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
- NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT_CHANGED);
+ NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT_CHANGED
+ );
String offchainUri = "execute_proposal_with_add_whitelisted_token";
// 1. Create and endorse proposal
@@ -640,7 +681,7 @@ public void execute_proposal_with_add_whitelisted_token() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("WhitelistedTokenAdded"));
Map tokens = treasury.getWhitelistedTokens();
@@ -655,7 +696,8 @@ public void execute_proposal_with_change_whitelisted_token_max_amount() throws T
assertThat(tokens.get(NeoToken.SCRIPT_HASH), is(NEO_MAX_AMOUNT_CHANGED));
ContractParameter intent = IntentParam.addWhitelistedTokenProposal(treasury.getScriptHash(),
- NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT);
+ NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT
+ );
String offchainUri = "execute_proposal_with_change_whitelisted_token_max_amount";
// 1. Create and endorse proposal
@@ -674,7 +716,7 @@ public void execute_proposal_with_change_whitelisted_token_max_amount() throws T
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("WhitelistedTokenAdded"));
tokens = treasury.getWhitelistedTokens();
@@ -695,12 +737,13 @@ public void funding_treasury_with_whitelisted_token_and_funder() throws Throwabl
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("Transfer"));
assertThat(n.getContract(), is(GasToken.SCRIPT_HASH));
assertThat(n.getState().getList().get(0).getAddress(), is(bob.getAddress()));
assertThat(n.getState().getList().get(1).getAddress(),
- is(treasury.getScriptHash().toAddress()));
+ is(treasury.getScriptHash().toAddress())
+ );
assertThat(n.getState().getList().get(2).getInteger(), is(BigInteger.ONE));
assertThat(gas.getBalanceOf(treasury.getScriptHash()).intValue(), is(initialValue + 1));
@@ -712,7 +755,8 @@ public void execute_proposal_with_release_tokens() throws Throwable {
Account acc = Account.create();
final BigInteger fundingAmount = BigInteger.TEN;
ContractParameter intent = IntentParam.releaseTokenProposal(treasury.getScriptHash(), GasToken.SCRIPT_HASH,
- acc.getScriptHash(), fundingAmount);
+ acc.getScriptHash(), fundingAmount
+ );
String offchainUri = "execute_proposal_with_release_tokens";
// 1. Create and endorse proposal
@@ -731,7 +775,7 @@ public void execute_proposal_with_release_tokens() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("Transfer"));
assertThat(new GasToken(neow3j).getBalanceOf(acc), is(fundingAmount));
@@ -759,58 +803,70 @@ public void succeed_pausing_contract() throws Throwable {
@Order(21)
@Test
- public void fail_add_funder_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_add_funder_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.addFunder(alice.getScriptHash(), alice.getECKeyPair().getPublicKey())
+ .signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(22)
@Test
- public void fail_remove_funder_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.removeFunder(alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_remove_funder_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.removeFunder(alice.getScriptHash()).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(23)
@Test
- public void fail_add_whitelisted_token_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_add_whitelisted_token_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.addWhitelistedToken(GasToken.SCRIPT_HASH, 1).signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(24)
@Test
- public void fail_remove_whitelisted_token_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_remove_whitelisted_token_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.removeWhitelistedToken(GasToken.SCRIPT_HASH).signers(AccountSigner.calledByEntry(alice))
+ .sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(25)
@Test
- public void fail_release_tokens_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_release_tokens_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.releaseTokens(GasToken.SCRIPT_HASH, alice.getScriptHash(), BigInteger.ONE)
+ .signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(26)
@Test
- public void fail_vote_on_committee_member_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.voteCommitteeMemberWithLeastVotes().signers(AccountSigner.calledByEntry(alice))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_vote_on_committee_member_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.voteCommitteeMemberWithLeastVotes().signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(27)
@Test
- public void fail_update_contract_on_paused_contract() throws Throwable {
- Hash256 tx = treasury.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null)
- .signers(AccountSigner.calledByEntry(alice)).sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is paused", neow3j);
+ public void fail_update_contract_on_paused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.updateContract(new byte[]{0x01, 0x02, 0x03}, "the manifest", null)
+ .signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is paused"));
}
@Order(28)
@@ -858,7 +914,8 @@ public void execute_proposal_with_update_contract() throws Throwable {
ContractParameter data = string("update contract");
ContractParameter intents = array(array(treasury.getScriptHash(), UPDATE_CONTRACT,
- array(nef.toArray(), manifestBytes, data), CallFlags.ALL.getValue()));
+ array(nef.toArray(), manifestBytes, data), CallFlags.ALL.getValue()
+ ));
String offchainUri = "execute_proposal_with_update_contract";
// 1. Create and endorse proposal
@@ -877,9 +934,8 @@ public void execute_proposal_with_update_contract() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("UpdatingContract"));
assertThat(n.getContract(), is(treasury.getScriptHash()));
}
-
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java b/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
index 251e324..c57e213 100644
--- a/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/ProposalExecutionsTest.java
@@ -4,11 +4,13 @@
import io.neow3j.contract.GasToken;
import io.neow3j.protocol.Neow3j;
import io.neow3j.protocol.core.response.NeoApplicationLog;
+import io.neow3j.protocol.core.response.Notification;
import io.neow3j.test.ContractTest;
import io.neow3j.test.ContractTestExtension;
import io.neow3j.test.DeployConfig;
import io.neow3j.test.DeployConfiguration;
import io.neow3j.transaction.AccountSigner;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.CallFlags;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash256;
@@ -21,20 +23,19 @@
import java.math.BigInteger;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHANGE_PARAM;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.CREATE;
-import static com.axlabs.neo.grantshares.util.TestHelper.DENISE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EVE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EXECUTE;
-import static com.axlabs.neo.grantshares.util.TestHelper.FLORIAN;
-import static com.axlabs.neo.grantshares.util.TestHelper.MIN_ACCEPTANCE_RATE_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.PROPOSAL_EXECUTED;
-import static com.axlabs.neo.grantshares.util.TestHelper.REVIEW_LENGTH_KEY;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.Events.PROPOSAL_EXECUTED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.CHANGE_PARAM;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.CREATE;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.EXECUTE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.EVE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.FLORIAN;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.MIN_ACCEPTANCE_RATE_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterNames.REVIEW_LENGTH_KEY;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
import static com.axlabs.neo.grantshares.util.TestHelper.voteForProposal;
@@ -45,6 +46,7 @@
import static io.neow3j.types.ContractParameter.string;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = GrantSharesGov.class, blockTime = 1, configFile = "default.neo-express",
@@ -68,14 +70,14 @@ public static DeployConfiguration deployConfig() throws Exception {
DeployConfiguration config = new DeployConfiguration();
config.setDeployParam(prepareDeployParameter(
ext.getAccount(ALICE), ext.getAccount(CHARLIE), ext.getAccount(DENISE), ext.getAccount(EVE),
- ext.getAccount(FLORIAN)));
+ ext.getAccount(FLORIAN)
+ ));
return config;
}
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
alice = ext.getAccount(ALICE);
bob = ext.getAccount(BOB);
@@ -86,21 +88,24 @@ public static void setUp() throws Throwable {
}
@Test
- public void fail_executing_non_existent_proposal() throws Throwable {
- Hash256 tx = gov.execute(1000).signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal doesn't exist", neow3j);
+ public void fail_executing_non_existent_proposal() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(1000).signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal doesn't exist"));
}
@Test
public void fail_executing_proposal_that_wasnt_endorsed() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 51), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 51), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_that_wasnt_endorsed";
// 1. Create proposal then skip till after the queued phase without endorsing.
Hash256 tx = gov.invokeFunction(CREATE, hash160(bob), intents, string(offchainUri),
- integer(-1))
+ integer(-1)
+ )
.signers(AccountSigner.calledByEntry(bob))
.sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
@@ -109,16 +114,18 @@ public void fail_executing_proposal_that_wasnt_endorsed() throws Throwable {
.getStack().get(0).getInteger().intValue();
// 2. Call execute
- tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal not in execution phase", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal not in execution phase"));
}
@Test
public void fail_executing_proposal_without_votes() throws Throwable {
int newValue = 60;
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, newValue), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, newValue), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_without_votes";
// 1. Create and endorse proposal, then skip till after the queued phase without voting.
@@ -126,15 +133,17 @@ public void fail_executing_proposal_without_votes() throws Throwable {
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH + PHASE_LENGTH);
// 2. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Quorum not reached", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Quorum not reached"));
}
@Test
public void fail_executing_accepted_proposal_multiple_times() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_accepted_proposal_multiple_times";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -156,18 +165,22 @@ public void fail_executing_accepted_proposal_multiple_times() throws Throwable {
.getNotifications().get(1).getEventName(), is(PROPOSAL_EXECUTED));
// 4. Call execute the second time and fail.
- tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal already executed", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal already executed"));
}
@Test
public void execute_proposal_with_multiple_intents() throws Throwable {
ContractParameter intents = array(
array(GasToken.SCRIPT_HASH, "transfer", array(alice.getScriptHash(),
- bob.getScriptHash(), 1, any(null)), CallFlags.ALL.getValue()),
+ bob.getScriptHash(), 1, any(null)
+ ), CallFlags.ALL.getValue()),
array(GasToken.SCRIPT_HASH, "transfer", array(alice.getScriptHash(),
- bob.getScriptHash(), 1, any(null)), CallFlags.ALL.getValue()));
+ bob.getScriptHash(), 1, any(null)
+ ), CallFlags.ALL.getValue())
+ );
String offchainUri = "execute_proposal_with_multiple_intents";
// 1. Create and endorse proposal
@@ -191,7 +204,7 @@ public void execute_proposal_with_multiple_intents() throws Throwable {
.getApplicationLog().getExecutions().get(0);
assertTrue(execution.getStack().get(0).getList().get(0).getBoolean());
assertTrue(execution.getStack().get(0).getList().get(1).getBoolean());
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("Transfer"));
assertThat(n.getContract(), is(GasToken.SCRIPT_HASH));
assertThat(n.getState().getList().get(0).getAddress(), is(alice.getAddress()));
@@ -212,7 +225,8 @@ public void execute_proposal_with_multiple_intents() throws Throwable {
@Test
public void fail_executing_proposal_quorum_reached_but_rejected() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_quorum_reached_but_rejected";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -228,15 +242,17 @@ public void fail_executing_proposal_quorum_reached_but_rejected() throws Throwab
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 3. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal rejected", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal rejected"));
}
@Test
public void fail_executing_proposal_quorum_reached_but_all_abstained() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_quorum_reached_but_all_abstained";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -252,15 +268,17 @@ public void fail_executing_proposal_quorum_reached_but_all_abstained() throws Th
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 3. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal rejected", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal rejected"));
}
@Test
public void fail_executing_proposal_quorum_not_reached() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_quorum_not_reached";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -273,15 +291,17 @@ public void fail_executing_proposal_quorum_not_reached() throws Throwable {
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 3. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Quorum not reached", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Quorum not reached"));
}
@Test
public void fail_executing_proposal_with_different_quorum_not_reached() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_with_different_quorum_not_reached";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -295,15 +315,17 @@ public void fail_executing_proposal_with_different_quorum_not_reached() throws T
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 3. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Quorum not reached", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Quorum not reached"));
}
@Test
public void fail_executing_proposal_with_different_quorum_reached_different_rate_rejected() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "fail_executing_proposal_with_different_quorum_reached_different_rate_rejected";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -319,15 +341,17 @@ public void fail_executing_proposal_with_different_quorum_reached_different_rate
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
// 3. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal rejected", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal rejected"));
}
@Test
public void succeed_executing_proposal_with_different_quorum_reached_different_rate_accepted() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM,
- array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()));
+ array(MIN_ACCEPTANCE_RATE_KEY, 40), CallFlags.ALL.getValue()
+ ));
String offchainUri = "succeed_executing_proposal_with_different_quorum_reached_different_rate_accepted";
// 1. Create and endorse proposal, then skip till voting phase.
@@ -351,7 +375,8 @@ public void succeed_executing_proposal_with_different_quorum_reached_different_r
@Test
public void fail_executing_expired_proposal() throws Throwable {
ContractParameter intents = array(array(gov.getScriptHash(), CHANGE_PARAM, array(REVIEW_LENGTH_KEY, 1),
- CallFlags.ALL.getValue()));
+ CallFlags.ALL.getValue()
+ ));
String discUrl = "fail_executing_expired_proposal";
// 1. Create and endorse proposal, then skip till after the queued phase without voting.
@@ -364,10 +389,9 @@ public void fail_executing_expired_proposal() throws Throwable {
ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH + PHASE_LENGTH); // skip voting, time lock, expiration phase
// 2. Call execute
- Hash256 tx = gov.execute(id).signers(AccountSigner.calledByEntry(bob))
- .sign().send().getSendRawTransaction().getHash();
- assertAborted(tx, "Proposal expired", neow3j);
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> gov.execute(id).signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Proposal expired"));
}
-
-
}
diff --git a/src/test/java/com/axlabs/neo/grantshares/TreasuryMigrationTest.java b/src/test/java/com/axlabs/neo/grantshares/TreasuryMigrationTest.java
deleted file mode 100644
index a3965e3..0000000
--- a/src/test/java/com/axlabs/neo/grantshares/TreasuryMigrationTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.axlabs.neo.grantshares;
-
-import com.axlabs.neo.grantshares.util.GrantSharesGovContract;
-import com.axlabs.neo.grantshares.util.GrantSharesTreasuryContract;
-import com.axlabs.neo.grantshares.util.IntentParam;
-import com.axlabs.neo.grantshares.util.TestHelper;
-import io.neow3j.compiler.CompilationUnit;
-import io.neow3j.compiler.Compiler;
-import io.neow3j.contract.GasToken;
-import io.neow3j.contract.NeoToken;
-import io.neow3j.contract.SmartContract;
-import io.neow3j.protocol.Neow3j;
-import io.neow3j.protocol.core.response.NeoApplicationLog;
-import io.neow3j.test.ContractTest;
-import io.neow3j.test.ContractTestExtension;
-import io.neow3j.test.DeployConfig;
-import io.neow3j.test.DeployConfiguration;
-import io.neow3j.test.DeployContext;
-import io.neow3j.transaction.AccountSigner;
-import io.neow3j.types.ContractParameter;
-import io.neow3j.types.Hash160;
-import io.neow3j.types.Hash256;
-import io.neow3j.utils.Await;
-import io.neow3j.wallet.Account;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.MULTI_SIG_THRESHOLD_RATIO;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
-import static io.neow3j.types.ContractParameter.array;
-import static io.neow3j.types.ContractParameter.map;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-
-@ContractTest(contracts = {GrantSharesGov.class, GrantSharesTreasuryOld.class}, blockTime = 1,
- configFile = "default.neo-express", batchFile = "setup.batch")
-public class TreasuryMigrationTest {
- static final int NEO_MAX_AMOUNT = 1000;
- static final int GAS_MAX_AMOUNT = 100000000;
-
- @RegisterExtension
- private static ContractTestExtension ext = new ContractTestExtension();
-
- private static Neow3j neow3j;
- private static GrantSharesGovContract gov;
- private static GrantSharesTreasuryContract treasury;
- private static Account alice; // Set to be a DAO member and funder
- private static Account bob; // Set to be a DAO member and funder
- private static Account charlie;
-
- @DeployConfig(GrantSharesGov.class)
- public static DeployConfiguration deployConfig() throws Exception {
- DeployConfiguration config = new DeployConfiguration();
- config.setDeployParam(prepareDeployParameter(ext.getAccount(ALICE), ext.getAccount(BOB)));
- return config;
- }
-
- @DeployConfig(GrantSharesTreasuryOld.class)
- public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws Exception {
- DeployConfiguration config = new DeployConfiguration();
- // owner
- SmartContract gov = ctx.getDeployedContract(GrantSharesGov.class);
-
- // funders
- Account alice = ext.getAccount(ALICE);
- Account bob = ext.getAccount(BOB);
- ContractParameter funders = array(
- array(alice.getScriptHash(), array(alice.getECKeyPair().getPublicKey())),
- array(bob.getScriptHash(), array(bob.getECKeyPair().getPublicKey()))
- );
-
- // whitelisted tokens
- Map tokens = new HashMap<>();
- tokens.put(NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT);
- tokens.put(GasToken.SCRIPT_HASH, GAS_MAX_AMOUNT);
- ContractParameter tokensParam = map(tokens);
-
- config.setDeployParam(array(gov.getScriptHash(), funders, tokensParam, MULTI_SIG_THRESHOLD_RATIO));
- return config;
- }
-
- @BeforeAll
- public static void setUp() throws Throwable {
- neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
- gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
- treasury = new GrantSharesTreasuryContract(
- ext.getDeployedContract(GrantSharesTreasuryOld.class).getScriptHash(), neow3j);
- alice = ext.getAccount(ALICE);
- bob = ext.getAccount(BOB);
- charlie = ext.getAccount(CHARLIE);
- }
-
- @Test
- public void updateContractAndMigrateStorage() throws Throwable {
- assertThat(treasury.getWhitelistedTokens().get(GasToken.SCRIPT_HASH).intValue(), is(GAS_MAX_AMOUNT));
-
- CompilationUnit res = new Compiler().compile(GrantSharesTreasury.class.getCanonicalName());
- Map newWhitelistedTokens = new HashMap<>();
- final int newGasTokenLimit = 2000000000;
- newWhitelistedTokens.put(GasToken.SCRIPT_HASH, (long) newGasTokenLimit);
- ContractParameter i = IntentParam.updateContractProposal(treasury.getScriptHash(),
- res.getNefFile(),
- res.getManifest(),
- map(newWhitelistedTokens));
-
- int id = TestHelper.createAndEndorseProposal(gov, neow3j, alice, bob, array(i),
- "updateContractAndMigrateStorage");
- ext.fastForwardOneBlock(PHASE_LENGTH);
- TestHelper.voteForProposal(gov, neow3j, id, alice);
- ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
- Hash256 tx = gov.execute(id).signers(AccountSigner.none(bob)).sign().send().getSendRawTransaction().getHash();
- Await.waitUntilTransactionIsExecuted(tx, neow3j);
-
- assertThat(treasury.getWhitelistedTokens().get(GasToken.SCRIPT_HASH).intValue(), is(newGasTokenLimit));
- assertThat(treasury.getWhitelistedTokens().get(NeoToken.SCRIPT_HASH).intValue(), is(NEO_MAX_AMOUNT));
-
- List notifications = neow3j.getApplicationLog(tx).send()
- .getApplicationLog().getExecutions().get(0).getNotifications();
- List migratedEvents = notifications.stream()
- .filter(n -> n.getEventName().equals("WhitelistedTokenMigrated")).collect(Collectors.toList());
- assertThat(migratedEvents.size(), is(1));
- assertThat(migratedEvents.get(0).getState().getList().get(0).getAddress(), is(GasToken.SCRIPT_HASH.toAddress()));
- assertThat(migratedEvents.get(0).getState().getList().get(1).getInteger().intValue(), is(newGasTokenLimit));
- }
-}
diff --git a/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java b/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
index 2ffb38a..31c0bcd 100644
--- a/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
+++ b/src/test/java/com/axlabs/neo/grantshares/TreasuryMultiSigTest.java
@@ -9,6 +9,7 @@
import io.neow3j.protocol.Neow3j;
import io.neow3j.protocol.core.response.NeoApplicationLog;
import io.neow3j.protocol.core.response.NeoGetNep17Balances;
+import io.neow3j.protocol.core.response.Notification;
import io.neow3j.test.ContractTest;
import io.neow3j.test.ContractTestExtension;
import io.neow3j.test.DeployConfig;
@@ -17,6 +18,7 @@
import io.neow3j.transaction.AccountSigner;
import io.neow3j.transaction.Transaction;
import io.neow3j.transaction.Witness;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash160;
import io.neow3j.types.Hash256;
@@ -34,15 +36,14 @@
import java.util.List;
import java.util.Map;
-import static com.axlabs.neo.grantshares.util.TestHelper.ALICE;
-import static com.axlabs.neo.grantshares.util.TestHelper.BOB;
-import static com.axlabs.neo.grantshares.util.TestHelper.CHARLIE;
-import static com.axlabs.neo.grantshares.util.TestHelper.DENISE;
-import static com.axlabs.neo.grantshares.util.TestHelper.EVE;
-import static com.axlabs.neo.grantshares.util.TestHelper.IS_PAUSED;
-import static com.axlabs.neo.grantshares.util.TestHelper.PAUSE;
-import static com.axlabs.neo.grantshares.util.TestHelper.PHASE_LENGTH;
-import static com.axlabs.neo.grantshares.util.TestHelper.assertAborted;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.IS_PAUSED;
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.PAUSE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.EVE;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
import static com.axlabs.neo.grantshares.util.TestHelper.createAndEndorseProposal;
import static com.axlabs.neo.grantshares.util.TestHelper.createMultiSigAccount;
import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
@@ -53,6 +54,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ContractTest(contracts = {GrantSharesGov.class, GrantSharesTreasury.class},
@@ -98,9 +100,11 @@ public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws
asList(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()), 2);
ContractParameter funders = array(
array(bob.getScriptHash(), // bob
- array(bob.getECKeyPair().getPublicKey())),
+ array(bob.getECKeyPair().getPublicKey())
+ ),
array(multiSigFunder.getScriptHash(), // denise, eve
- array(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey()))
+ array(denise.getECKeyPair().getPublicKey(), eve.getECKeyPair().getPublicKey())
+ )
);
// whitelisted tokens
@@ -116,7 +120,6 @@ public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws
@BeforeAll
public static void setUp() throws Throwable {
neow3j = ext.getNeow3j();
- neow3j.allowTransmissionOnFault();
// contracts
gov = new GrantSharesGovContract(
ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
@@ -160,7 +163,7 @@ public void execute_proposal_with_modify_threshold() throws Throwable {
NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send()
.getApplicationLog().getExecutions().get(0);
- NeoApplicationLog.Execution.Notification n = execution.getNotifications().get(0);
+ Notification n = execution.getNotifications().get(0);
assertThat(n.getEventName(), is("ThresholdChanged"));
assertThat(treasury.getFundersMultiSigThresholdRatio(), is(51));
}
@@ -181,10 +184,11 @@ public void calc_funders_multisig_address() throws Throwable {
@Test
@Order(0)
- public void fail_execute_drain_on_unpaused_contract() throws Throwable {
- Hash256 tx = treasury.drain().signers(AccountSigner.calledByEntry(alice)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Contract is not paused", neow3j);
+ public void fail_execute_drain_on_unpaused_contract() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.drain().signers(AccountSigner.calledByEntry(alice)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Contract is not paused"));
}
@Order(10)
@@ -209,10 +213,11 @@ public void succeed_pausing_contract() throws Throwable {
@Order(11)
@Test
- public void fail_execute_drain_with_non_funder() throws Throwable {
- Hash256 tx = treasury.drain().signers(AccountSigner.calledByEntry(bob)).sign().send()
- .getSendRawTransaction().getHash();
- assertAborted(tx, "Not authorized", neow3j);
+ public void fail_execute_drain_with_non_funder() {
+ TransactionConfigurationException e = assertThrows(TransactionConfigurationException.class,
+ () -> treasury.drain().signers(AccountSigner.calledByEntry(bob)).sign()
+ );
+ assertTrue(e.getMessage().endsWith("Not authorized"));
}
@Order(12)
diff --git a/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTest.java b/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTest.java
new file mode 100644
index 0000000..aa25aee
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTest.java
@@ -0,0 +1,334 @@
+package com.axlabs.neo.grantshares.bridgeadapter;
+
+import com.axlabs.neo.grantshares.GrantSharesBridgeAdapter;
+import io.neow3j.contract.FungibleToken;
+import io.neow3j.contract.GasToken;
+import io.neow3j.contract.NefFile;
+import io.neow3j.contract.NeoToken;
+import io.neow3j.contract.SmartContract;
+import io.neow3j.protocol.Neow3j;
+import io.neow3j.protocol.core.response.ContractManifest;
+import io.neow3j.protocol.core.response.ContractState;
+import io.neow3j.protocol.core.response.NeoApplicationLog;
+import io.neow3j.protocol.core.response.NeoSendRawTransaction;
+import io.neow3j.protocol.core.response.Notification;
+import io.neow3j.serialization.exceptions.DeserializationException;
+import io.neow3j.test.ContractTest;
+import io.neow3j.test.ContractTestExtension;
+import io.neow3j.test.DeployConfig;
+import io.neow3j.test.DeployConfiguration;
+import io.neow3j.test.DeployContext;
+import io.neow3j.transaction.TransactionBuilder;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
+import io.neow3j.types.ContractParameter;
+import io.neow3j.types.Hash160;
+import io.neow3j.types.Hash256;
+import io.neow3j.wallet.Account;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.EVE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.FLORIAN;
+import static io.neow3j.protocol.ObjectMapperFactory.getObjectMapper;
+import static io.neow3j.transaction.AccountSigner.calledByEntry;
+import static io.neow3j.transaction.AccountSigner.global;
+import static io.neow3j.transaction.AccountSigner.none;
+import static io.neow3j.types.ContractParameter.any;
+import static io.neow3j.types.ContractParameter.array;
+import static io.neow3j.types.ContractParameter.byteArray;
+import static io.neow3j.types.ContractParameter.byteArrayFromString;
+import static io.neow3j.types.ContractParameter.hash160;
+import static io.neow3j.types.ContractParameter.integer;
+import static io.neow3j.utils.Await.waitUntilTransactionIsExecuted;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@ContractTest(
+ contracts = {GrantSharesBridgeAdapter.class},
+ blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class BridgeAdapterTest {
+
+ private static final BigInteger DEFAULT_BRIDGE_FEE = FungibleToken.toFractions(new BigDecimal("0.1"), 8);
+
+ @RegisterExtension
+ static ContractTestExtension ext = new ContractTestExtension();
+
+ static Neow3j neow3j;
+ static Account owner;
+ static Hash160 whitelistedFunder;
+ static SmartContract bridgeAdapter;
+ static Account alice; // Set to be a DAO member.
+ static Account bob;
+ static Account charlie; // Set to be a DAO member.
+ static Account denise; // Set to be a DAO member.
+ static Account eve; // Set to be a DAO member.
+ static Account florian; // Set to be a DAO member.
+
+ // region deploy configuration
+
+ @DeployConfig(GrantSharesBridgeAdapter.class)
+ public static DeployConfiguration deployConfigBridgeAdapter(DeployContext ctx) throws Exception {
+ DeployConfiguration config = new DeployConfiguration();
+
+ Hash160 govContractHash = new Hash160("0x2980dba54983777175780c59f64c59d2fbd5df48");
+ Hash160 treasuryContractHash = new Hash160("0x95434943e07ab980dd9fbe4edc0edefb17a13517");
+ Hash160 bridgeContractHash = new Hash160("0x0fbd890eb881e899fa451e561e3fef4c67184357");
+
+ Account initialOwner = ext.getAccount(ALICE);
+ config.setDeployParam(array(initialOwner, govContractHash, treasuryContractHash, bridgeContractHash,
+ FungibleToken.toFractions(new BigDecimal("0.1"), 8), ext.getAccount(CHARLIE)
+ ));
+ config.setSigner(global(initialOwner));
+ return config;
+ }
+
+ // endregion deploy configuration
+ // region setup
+
+ @BeforeAll
+ public static void setUp() throws Throwable {
+ neow3j = ext.getNeow3j();
+ bridgeAdapter = new SmartContract(ext.getDeployedContract(GrantSharesBridgeAdapter.class).getScriptHash(),
+ neow3j
+ );
+
+ alice = ext.getAccount(ALICE);
+ bob = ext.getAccount(BOB);
+ charlie = ext.getAccount(CHARLIE);
+ denise = ext.getAccount(DENISE);
+ eve = ext.getAccount(EVE);
+ florian = ext.getAccount(FLORIAN);
+
+ owner = alice;
+ whitelistedFunder = charlie.getScriptHash();
+ }
+
+ // endregion setup
+ // region bridge function unauthorized
+
+ @Test
+ @Order(10)
+ public void failInvokeBridgeFunctionIfNotGovContract() {
+ TransactionBuilder b = bridgeAdapter.invokeFunction("bridge", hash160(GasToken.SCRIPT_HASH), hash160(bob),
+ integer(1)
+ ).signers(none(owner));
+
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("only GrantSharesGov contract"));
+ }
+
+ // endregion bridge function unauthorized
+ // region nep-17 transfer
+
+ @Test
+ @Order(0)
+ public void whitelistedFunderIsAllowedToSendGas() throws Throwable {
+ GasToken gasToken = new GasToken(neow3j);
+ BigInteger adapterBalanceBefore = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger amount = BigInteger.TEN;
+
+ Account whitelistedFunderAcc = ext.getAccount(whitelistedFunder.toAddress());
+ NeoSendRawTransaction response = gasToken.transfer(whitelistedFunderAcc, bridgeAdapter.getScriptHash(), amount)
+ .sign().send();
+ assertFalse(response.hasError());
+ Hash256 txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ BigInteger adapterBalanceAfter = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ assertThat(adapterBalanceAfter, is(adapterBalanceBefore.add(amount)));
+ }
+
+ @Test
+ @Order(0)
+ public void whitelistedFunderIsNotAllowedToTransferTokenOtherThanGas() throws Throwable {
+ NeoToken neoToken = new NeoToken(neow3j);
+
+ Account whitelistedFunderAcc = ext.getAccount(whitelistedFunder.toAddress());
+ TransactionBuilder b = neoToken.transfer(whitelistedFunderAcc, bridgeAdapter.getScriptHash(), BigInteger.TEN);
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+
+ assertThat(thrown.getMessage(), containsString("only treasury"));
+ }
+
+ // endregion nep-17 transfer
+ // region test setters
+
+ @Test
+ @Order(10)
+ public void setWhitelistedFunder() throws Throwable {
+ Hash160 newWhitelistedFunder = eve.getScriptHash();
+ assertThat(bridgeAdapter.callFunctionReturningScriptHash("whitelistedFunder"), is(whitelistedFunder));
+
+ NeoSendRawTransaction response = bridgeAdapter.invokeFunction("setWhitelistedFunder",
+ hash160(newWhitelistedFunder)
+ ).signers(calledByEntry(owner)).sign().send();
+
+ assertFalse(response.hasError());
+ Hash256 txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+ List executions = neow3j
+ .getApplicationLog(txHash).send().getApplicationLog().getExecutions();
+ assertThat(executions.size(), is(1));
+
+ List notifications = executions.get(0).getNotifications();
+ assertThat(notifications.size(), is(1));
+ assertThat(notifications.get(0).getEventName(), is("WhitelistedFunderAdded"));
+ assertThat(notifications.get(0).getState().getList().get(0).getAddress(), is(newWhitelistedFunder.toAddress()));
+
+ assertThat(bridgeAdapter.callFunctionReturningScriptHash("whitelistedFunder"), is(newWhitelistedFunder));
+
+ // Reset to default
+ response = bridgeAdapter.invokeFunction("setWhitelistedFunder", hash160(whitelistedFunder))
+ .signers(calledByEntry(owner))
+ .sign().send();
+ assertFalse(response.hasError());
+ txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+ }
+
+ @Test
+ @Order(10)
+ public void failSetWhitelistedFunder_unauthorized() {
+ TransactionBuilder b = bridgeAdapter.invokeFunction("setWhitelistedFunder",
+ hash160(eve.getScriptHash())
+ ).signers(calledByEntry(bob));
+
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("unauthorized"));
+ }
+
+ @Test
+ @Order(10)
+ public void failSetWhitelistedFunder_invalid() {
+ TransactionBuilder b = bridgeAdapter.invokeFunction("setWhitelistedFunder", byteArrayFromString("hello"))
+ .signers(calledByEntry(owner));
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("invalid funder"));
+
+
+ b = bridgeAdapter.invokeFunction("setWhitelistedFunder", any(null))
+ .signers(calledByEntry(owner));
+ thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("invalid funder"));
+ }
+
+ @Test
+ @Order(10)
+ public void setMaxFee() throws Throwable {
+ int newFee = 1;
+ assertThat(bridgeAdapter.callFunctionReturningInt("maxFee"), is(DEFAULT_BRIDGE_FEE));
+ assertThat(DEFAULT_BRIDGE_FEE, is(not(newFee)));
+
+ NeoSendRawTransaction response = bridgeAdapter.invokeFunction("setMaxFee", integer(1))
+ .signers(calledByEntry(owner)).sign().send();
+ assertFalse(response.hasError());
+ Hash256 txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ List executions = neow3j.getApplicationLog(txHash).send()
+ .getApplicationLog()
+ .getExecutions();
+ assertThat(executions.size(), is(1));
+
+ List notifications = executions.get(0).getNotifications();
+ assertThat(notifications.size(), is(1));
+ assertThat(notifications.get(0).getEventName(), is("MaxFeeChanged"));
+ assertThat(notifications.get(0).getState().getList().get(0).getInteger().intValue(), is(newFee));
+
+ assertThat(bridgeAdapter.callFunctionReturningInt("maxFee"), is(BigInteger.valueOf(newFee)));
+
+ // Reset to default
+ response = bridgeAdapter.invokeFunction("setMaxFee", integer(DEFAULT_BRIDGE_FEE)).signers(calledByEntry(owner))
+ .sign().send();
+ assertFalse(response.hasError());
+ txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+ }
+
+ @Test
+ @Order(10)
+ public void failSetMaxFee_unauthorized() {
+ TransactionBuilder b = bridgeAdapter.invokeFunction("setMaxFee", integer(1)).signers(none(bob));
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("unauthorized"));
+ }
+
+ @Test
+ @Order(10)
+ public void failSetMaxFee_negative() {
+ TransactionBuilder b = bridgeAdapter.invokeFunction("setMaxFee", integer(-1)).signers(calledByEntry(owner));
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("invalid max fee"));
+
+ b = bridgeAdapter.invokeFunction("setMaxFee", any(null)).signers(calledByEntry(owner));
+ thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("invalid max fee"));
+ }
+
+ // endregion test setters
+ // region test update
+
+ @Test
+ @Order(99)
+ public void testUpdate_notAuthorized() throws Throwable {
+ TransactionBuilder b = updateTxBuilder().signers(calledByEntry(bob));
+ TransactionConfigurationException thrown = assertThrows(TransactionConfigurationException.class, b::sign);
+ assertThat(thrown.getMessage(), containsString("unauthorized"));
+ }
+
+ @Test
+ @Order(100)
+ public void testUpdate() throws Throwable {
+ ContractState contractState = neow3j.getContractState(bridgeAdapter.getScriptHash()).send().getContractState();
+ assertThat(contractState.getUpdateCounter(), is(0));
+ assertThat(contractState.getNef().getChecksum(), is(4081308222L));
+
+ NeoSendRawTransaction response = updateTxBuilder().signers(calledByEntry(alice)).sign().send();
+ assertFalse(response.hasError());
+ Hash256 txHash = response.getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ ContractState contractStateAfterUpdate = neow3j.getContractState(bridgeAdapter.getScriptHash()).send()
+ .getContractState();
+ assertThat(contractStateAfterUpdate.getUpdateCounter(), is(1));
+ assertThat(contractStateAfterUpdate.getNef().getChecksum(), is(4241155401L));
+ }
+
+ private TransactionBuilder updateTxBuilder() throws URISyntaxException, IOException, DeserializationException {
+ Path testNefFile = Paths.get("TestGrantSharesBridgeAdapter.nef");
+ Path testManifestFile = Paths.get("TestGrantSharesBridgeAdapter.manifest.json");
+
+ File nefFile = new File(getClass().getClassLoader().getResource(testNefFile.toString()).toURI());
+ ContractParameter nefParam = byteArray(NefFile.readFromFile(nefFile).toArray());
+
+ File manifestFile = new File(getClass().getClassLoader().getResource(testManifestFile.toString()).toURI());
+ ContractManifest manifest = getObjectMapper().readValue(manifestFile, ContractManifest.class);
+ ContractParameter manifestParam = byteArray(getObjectMapper().writeValueAsBytes(manifest));
+
+ return bridgeAdapter.invokeFunction("update", nefParam, manifestParam, any(null));
+ }
+
+ // endregion test update
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTestUsingBridgeV3.java b/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTestUsingBridgeV3.java
new file mode 100644
index 0000000..94a52fb
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/bridgeadapter/BridgeAdapterTestUsingBridgeV3.java
@@ -0,0 +1,839 @@
+package com.axlabs.neo.grantshares.bridgeadapter;
+
+import com.axlabs.neo.grantshares.GrantSharesBridgeAdapter;
+import com.axlabs.neo.grantshares.GrantSharesGov;
+import com.axlabs.neo.grantshares.GrantSharesTreasury;
+import com.axlabs.neo.grantshares.util.GrantSharesGovContract;
+import com.axlabs.neo.grantshares.util.GrantSharesTreasuryContract;
+import com.axlabs.neo.grantshares.util.TestHelper;
+import com.axlabs.neo.grantshares.util.contracts.TestBridgeV3;
+import com.axlabs.neo.grantshares.util.proposal.ProposalBuilder;
+import com.axlabs.neo.grantshares.util.proposal.ProposalData;
+import io.neow3j.contract.FungibleToken;
+import io.neow3j.contract.GasToken;
+import io.neow3j.contract.NeoToken;
+import io.neow3j.contract.SmartContract;
+import io.neow3j.protocol.Neow3j;
+import io.neow3j.protocol.core.response.NeoApplicationLog;
+import io.neow3j.protocol.core.response.Notification;
+import io.neow3j.test.ContractTest;
+import io.neow3j.test.ContractTestExtension;
+import io.neow3j.test.DeployConfig;
+import io.neow3j.test.DeployConfiguration;
+import io.neow3j.test.DeployContext;
+import io.neow3j.transaction.ContractSigner;
+import io.neow3j.transaction.TransactionBuilder;
+import io.neow3j.transaction.exceptions.TransactionConfigurationException;
+import io.neow3j.transaction.witnessrule.AndCondition;
+import io.neow3j.transaction.witnessrule.CalledByContractCondition;
+import io.neow3j.transaction.witnessrule.OrCondition;
+import io.neow3j.transaction.witnessrule.ScriptHashCondition;
+import io.neow3j.transaction.witnessrule.WitnessAction;
+import io.neow3j.transaction.witnessrule.WitnessRule;
+import io.neow3j.types.ContractParameter;
+import io.neow3j.types.Hash160;
+import io.neow3j.types.Hash256;
+import io.neow3j.types.NeoVMStateType;
+import io.neow3j.wallet.Account;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.axlabs.neo.grantshares.util.TestHelper.GovernanceMethods.EXECUTE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.ALICE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.BOB;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.CHARLIE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.DENISE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.EVE;
+import static com.axlabs.neo.grantshares.util.TestHelper.Members.FLORIAN;
+import static com.axlabs.neo.grantshares.util.TestHelper.ParameterValues.PHASE_LENGTH;
+import static com.axlabs.neo.grantshares.util.TestHelper.prepareDeployParameter;
+import static com.axlabs.neo.grantshares.util.TestHelper.voteForProposal;
+import static io.neow3j.transaction.AccountSigner.global;
+import static io.neow3j.transaction.AccountSigner.none;
+import static io.neow3j.types.ContractParameter.array;
+import static io.neow3j.types.ContractParameter.hash160;
+import static io.neow3j.types.ContractParameter.integer;
+import static io.neow3j.types.ContractParameter.map;
+import static io.neow3j.utils.Await.waitUntilTransactionIsExecuted;
+import static io.neow3j.utils.Numeric.hexStringToByteArray;
+import static io.neow3j.utils.Numeric.reverseHexString;
+import static io.neow3j.utils.Numeric.toHexString;
+import static io.neow3j.utils.Numeric.toHexStringNoPrefix;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.core.Is.is;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@ContractTest(
+ contracts = {GrantSharesGov.class, GrantSharesTreasury.class, TestBridgeV3.class,
+ GrantSharesBridgeAdapter.class},
+ blockTime = 1, configFile = "default.neo-express", batchFile = "setup.batch")
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+public class BridgeAdapterTestUsingBridgeV3 {
+
+ private static final BigInteger NEO_MAX_AMOUNT = BigInteger.valueOf(100);
+ private static final BigInteger GAS_MAX_AMOUNT = FungibleToken.toFractions(BigDecimal.valueOf(10000), 8);
+ private static final int MULTI_SIG_THRESHOLD_RATIO = 50;
+ private static final BigInteger DEFAULT_BRIDGE_FEE = FungibleToken.toFractions(new BigDecimal("0.1"), 8);
+
+ @RegisterExtension
+ static ContractTestExtension ext = new ContractTestExtension();
+
+ static Neow3j neow3j;
+ static Account owner;
+ static Hash160 whitelistedFunder;
+ static GrantSharesGovContract gov;
+ static GrantSharesTreasuryContract treasury;
+ static SmartContract bridgeAdapter;
+ static SmartContract bridge;
+ static Account alice; // Set to be a DAO member.
+ static Account bob;
+ static Account charlie; // Set to be a DAO member.
+ static Account denise; // Set to be a DAO member.
+ static Account eve; // Set to be a DAO member.
+ static Account florian; // Set to be a DAO member.
+
+ static String bridgeAdapterHashLittleEndianHex;
+ static String gsGovHashLittleEndianHex;
+
+ // region deploy configuration
+
+ @DeployConfig(GrantSharesGov.class)
+ public static DeployConfiguration deployConfig() throws Exception {
+ DeployConfiguration config = new DeployConfiguration();
+ config.setDeployParam(
+ prepareDeployParameter(ext.getAccount(ALICE), ext.getAccount(CHARLIE), ext.getAccount(DENISE),
+ ext.getAccount(EVE), ext.getAccount(FLORIAN)
+ ));
+ return config;
+ }
+
+ @DeployConfig(GrantSharesTreasury.class)
+ public static DeployConfiguration deployConfigTreasury(DeployContext ctx) throws Exception {
+ DeployConfiguration config = new DeployConfiguration();
+ // owner
+ SmartContract gov = ctx.getDeployedContract(GrantSharesGov.class);
+
+ // funders
+ Account bob = ext.getAccount(BOB);
+ ContractParameter funders = array(array(bob.getScriptHash(), array(bob.getECKeyPair().getPublicKey())));
+
+ // whitelisted tokens
+ Map tokens = new HashMap<>();
+ tokens.put(NeoToken.SCRIPT_HASH, NEO_MAX_AMOUNT);
+ tokens.put(GasToken.SCRIPT_HASH, GAS_MAX_AMOUNT);
+ ContractParameter tokensParam = map(tokens);
+
+ config.setDeployParam(array(gov.getScriptHash(), funders, tokensParam, MULTI_SIG_THRESHOLD_RATIO));
+ return config;
+ }
+
+ @DeployConfig(TestBridgeV3.class)
+ public static DeployConfiguration deployConfigTestBridge() {
+ DeployConfiguration config = new DeployConfiguration();
+ config.setDeployParam(integer(DEFAULT_BRIDGE_FEE));
+ return config;
+ }
+
+ @DeployConfig(GrantSharesBridgeAdapter.class)
+ public static DeployConfiguration deployConfigBridgeAdapter(DeployContext ctx) throws Exception {
+ DeployConfiguration config = new DeployConfiguration();
+
+ SmartContract gov = ctx.getDeployedContract(GrantSharesGov.class);
+ SmartContract treasury = ctx.getDeployedContract(GrantSharesTreasury.class);
+ SmartContract bridge = ctx.getDeployedContract(TestBridgeV3.class);
+
+ Account initialOwner = ext.getAccount(ALICE);
+ config.setDeployParam(array(initialOwner, gov.getScriptHash(), treasury.getScriptHash(), bridge.getScriptHash(),
+ FungibleToken.toFractions(new BigDecimal("0.1"), 8), ext.getAccount(CHARLIE)
+ ));
+ config.setSigner(global(initialOwner));
+ return config;
+ }
+
+ // endregion deploy configuration
+ // region setup
+
+ @BeforeAll
+ public static void setUp() throws Throwable {
+ neow3j = ext.getNeow3j();
+ gov = new GrantSharesGovContract(ext.getDeployedContract(GrantSharesGov.class).getScriptHash(), neow3j);
+ treasury = new GrantSharesTreasuryContract(ext.getDeployedContract(GrantSharesTreasury.class).getScriptHash(),
+ neow3j
+ );
+ bridge = new SmartContract(ext.getDeployedContract(TestBridgeV3.class).getScriptHash(), neow3j);
+ bridgeAdapter = new SmartContract(ext.getDeployedContract(GrantSharesBridgeAdapter.class).getScriptHash(),
+ neow3j
+ );
+
+ gsGovHashLittleEndianHex = toHexStringNoPrefix(gov.getScriptHash().toLittleEndianArray());
+ bridgeAdapterHashLittleEndianHex = toHexStringNoPrefix(bridgeAdapter.getScriptHash().toLittleEndianArray());
+
+ alice = ext.getAccount(ALICE);
+ bob = ext.getAccount(BOB);
+ charlie = ext.getAccount(CHARLIE);
+ denise = ext.getAccount(DENISE);
+ eve = ext.getAccount(EVE);
+ florian = ext.getAccount(FLORIAN);
+
+ owner = alice;
+ whitelistedFunder = charlie.getScriptHash();
+
+ // fund the treasury with GAS
+ GasToken gasToken = new GasToken(neow3j);
+ Hash256 tx = gasToken.transfer(bob, treasury.getScriptHash(), gasToken.toFractions(new BigDecimal("100")))
+ .sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+
+ // fund the treasury with NEO
+ tx = new NeoToken(neow3j).transfer(bob, treasury.getScriptHash(), BigInteger.valueOf(100)).sign().send()
+ .getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+ }
+
+ // endregion setup
+ // region fund request native deposit
+
+ @Test
+ @Order(1)
+ public void execute_proposal_native_deposit() throws Throwable {
+ GasToken gasToken = new GasToken(neow3j);
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("nativeDepositFee");
+
+ BigInteger treasuryBalanceBefore = gasToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdapterBalanceBefore = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceBefore = gasToken.getBalanceOf(bridge.getScriptHash());
+
+ // Data from Neo X
+ Account proposer = bob;
+ Hash160 recipient = alice.getScriptHash();
+ BigInteger amount = gasToken.toFractions(BigDecimal.TEN);
+ String offchainUri = "native_deposit";
+ int linkedProposal = -1;
+
+ // 1. Create proposal
+ ProposalData proposalData = new ProposalData(offchainUri, linkedProposal);
+ byte[] proposalScript = ProposalBuilder.buildRequestForFundsTxScriptGas(proposer, proposalData,
+ gov.getScriptHash(), treasury.getScriptHash(), bridgeAdapter.getScriptHash(), recipient, amount,
+ bridgeFee
+ );
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ Hash256 tx = gov.invokeFunction(EXECUTE, integer(id)).signers(none(proposer),
+ ContractSigner.calledByEntry(bridgeAdapter.getScriptHash()).setRules(
+ new WitnessRule(WitnessAction.ALLOW,
+ new AndCondition(new ScriptHashCondition(gasToken.getScriptHash()),
+ new CalledByContractCondition(bridge.getScriptHash())
+ )
+ ))
+ ).sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+
+ NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send().getApplicationLog()
+ .getFirstExecution();
+ assertNull(execution.getException());
+ assertThat(execution.getState(), is(NeoVMStateType.HALT));
+
+ BigInteger treasuryBalanceAfter = gasToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdaptorBalanceAfter = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceAfter = gasToken.getBalanceOf(bridge.getScriptHash());
+
+ // Assert Balances
+ assertThat(treasuryBalanceAfter, is(treasuryBalanceBefore.subtract(amount).subtract(bridgeFee)));
+ assertThat(bridgeAdaptorBalanceAfter, is(bridgeAdapterBalanceBefore));
+ assertThat(bridgeBalanceAfter, is(bridgeBalanceBefore.add(amount.add(bridgeFee))));
+
+ List n = execution.getNotifications();
+ assertThat(n, hasSize(8));
+
+ // Intent #1: Bridge fee payment from treasury to bridge adapter.
+ Notification n0 = n.get(0);
+ assertThat(n0.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n0.getEventName(), is("Transfer"));
+ assertThat(n0.getState().getList().get(0).getAddress(), is(treasury.getScriptHash().toAddress()));
+ assertThat(n0.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n0.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ Notification n1 = n.get(1);
+ assertThat(n1.getContract(), is(treasury.getScriptHash()));
+ assertThat(n1.getEventName(), is("TokenReleased"));
+ assertThat(n1.getState().getList().get(0).getAddress(), is(gasToken.getScriptHash().toAddress()));
+ assertThat(n1.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n1.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ // Intent #2: Transfer from bridge adapter to bridge.
+ Notification n2 = n.get(2);
+ assertThat(n2.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n2.getEventName(), is("Transfer"));
+ assertThat(n2.getState().getList().get(0).getAddress(), is(treasury.getScriptHash().toAddress()));
+ assertThat(n2.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n2.getState().getList().get(2).getInteger(), is(amount));
+
+ Notification n3 = n.get(3);
+ assertThat(n3.getContract(), is(treasury.getScriptHash()));
+ assertThat(n3.getEventName(), is("TokenReleased"));
+ assertThat(n3.getState().getList().get(0).getAddress(), is(gasToken.getScriptHash().toAddress()));
+ assertThat(n3.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n3.getState().getList().get(2).getInteger(), is(amount));
+
+ // Intent #3: Invoke bridge adapter to bridge.
+ Notification n5 = n.get(4); // Fee payment transfer
+ assertThat(n5.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n5.getEventName(), is("Transfer"));
+ assertThat(n5.getState().getList().get(0).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n5.getState().getList().get(1).getAddress(), is(bridge.getScriptHash().toAddress()));
+ assertThat(n5.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ Notification n6 = n.get(5); // Gas payment
+ assertThat(n6.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n6.getEventName(), is("Transfer"));
+ assertThat(n6.getState().getList().get(0).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n6.getState().getList().get(1).getAddress(), is(bridge.getScriptHash().toAddress()));
+ assertThat(n6.getState().getList().get(2).getInteger(), is(amount));
+
+ Notification n7 = n.get(6); // Deposit event
+ assertThat(n7.getContract(), is(bridge.getScriptHash()));
+ assertThat(n7.getEventName(), is("NativeDeposit"));
+ assertThat(n7.getState().getList().get(0).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n7.getState().getList().get(1).getAddress(), is(recipient.toAddress()));
+ assertThat(n7.getState().getList().get(2).getInteger(), is(amount));
+
+ // Proposal executed event
+ Notification n8 = n.get(7);
+ assertThat(n8.getContract(), is(gov.getScriptHash()));
+ assertThat(n8.getEventName(), is("ProposalExecuted"));
+ assertThat(n8.getState().getList().get(0).getInteger(), is(BigInteger.ZERO));
+ }
+
+ // endregion
+ // region fund request token deposit
+
+ @Test
+ @Order(2)
+ public void execute_proposal_token_deposit() throws Throwable {
+ GasToken gasToken = new GasToken(neow3j);
+ NeoToken neoToken = new NeoToken(neow3j);
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("tokenDepositFee", hash160(neoToken.getScriptHash()));
+
+ BigInteger treasuryBalanceBeforeNeo = neoToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdapterBalanceBeforeNeo = neoToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceBeforeNeo = neoToken.getBalanceOf(bridge.getScriptHash());
+
+ BigInteger treasuryBalanceBeforeGas = gasToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdapterBalanceBeforeGas = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceBeforeGas = gasToken.getBalanceOf(bridge.getScriptHash());
+
+ // Data from Neo X
+ Account proposer = charlie;
+ Hash160 recipient = eve.getScriptHash();
+ BigInteger amount = BigInteger.TEN;
+ String offchainUri = "token_deposit";
+ int linkedProposal = -1;
+
+ // 1. Create proposal
+ ProposalData proposalData = new ProposalData(offchainUri, linkedProposal);
+ byte[] proposalScript = ProposalBuilder.buildRequestForFundsTxScriptNeo(proposer, proposalData,
+ gov.getScriptHash(), treasury.getScriptHash(), bridgeAdapter.getScriptHash(), recipient, amount,
+ bridgeFee
+ );
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ Hash256 tx = gov.invokeFunction(EXECUTE, integer(id)).signers(none(proposer),
+ ContractSigner.calledByEntry(bridgeAdapter.getScriptHash()).setRules(
+ new WitnessRule(WitnessAction.ALLOW, new AndCondition(
+ new OrCondition(new ScriptHashCondition(gasToken.getScriptHash()),
+ new ScriptHashCondition(neoToken.getScriptHash())
+ ), new CalledByContractCondition(bridge.getScriptHash())
+ )
+ ))
+ ).sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(tx, neow3j);
+
+ NeoApplicationLog.Execution execution = neow3j.getApplicationLog(tx).send().getApplicationLog()
+ .getFirstExecution();
+ assertNull(execution.getException());
+ assertThat(execution.getState(), is(NeoVMStateType.HALT));
+
+ BigInteger treasuryBalanceAfterNeo = neoToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdaptorBalanceAfterNeo = neoToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceAfterNeo = neoToken.getBalanceOf(bridge.getScriptHash());
+
+ BigInteger treasuryBalanceAfterGas = gasToken.getBalanceOf(treasury.getScriptHash());
+ BigInteger bridgeAdaptorBalanceAfterGas = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ BigInteger bridgeBalanceAfterGas = gasToken.getBalanceOf(bridge.getScriptHash());
+
+ // Assert Balances
+ assertThat(treasuryBalanceAfterNeo, is(treasuryBalanceBeforeNeo.subtract(amount)));
+ assertThat(bridgeAdaptorBalanceAfterNeo, is(bridgeAdapterBalanceBeforeNeo));
+ assertThat(bridgeBalanceAfterNeo, is(bridgeBalanceBeforeNeo.add(amount)));
+
+ assertThat(treasuryBalanceAfterGas, lessThan(treasuryBalanceBeforeGas));
+ assertThat(treasuryBalanceAfterGas, greaterThan(treasuryBalanceBeforeGas.subtract(bridgeFee)));
+ assertThat(bridgeAdaptorBalanceAfterGas, is(bridgeAdapterBalanceBeforeGas));
+ assertThat(bridgeBalanceAfterGas, is(bridgeBalanceBeforeGas.add(bridgeFee)));
+
+ List n = execution.getNotifications();
+ assertThat(n, hasSize(9));
+
+ // Intent #1: Bridge fee payment from treasury to bridge adapter.
+ Notification n0 = n.get(0);
+ assertThat(n0.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n0.getEventName(), is("Transfer"));
+ assertThat(n0.getState().getList().get(0).getAddress(), is(treasury.getScriptHash().toAddress()));
+ assertThat(n0.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n0.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ Notification n1 = n.get(1);
+ assertThat(n1.getContract(), is(treasury.getScriptHash()));
+ assertThat(n1.getEventName(), is("TokenReleased"));
+ assertThat(n1.getState().getList().get(0).getAddress(), is(gasToken.getScriptHash().toAddress()));
+ assertThat(n1.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n1.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ // Intent #2: Transfer from bridge adapter to bridge.
+ Notification n2 = n.get(2);
+ assertThat(n2.getContract(), is(neoToken.getScriptHash()));
+ assertThat(n2.getEventName(), is("Transfer"));
+ assertThat(n2.getState().getList().get(0).getAddress(), is(treasury.getScriptHash().toAddress()));
+ assertThat(n2.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n2.getState().getList().get(2).getInteger(), is(amount));
+
+ Notification n3 = n.get(3); // Gas reward from holding Neo
+ assertThat(n3.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n3.getEventName(), is("Transfer"));
+ assertNull(n3.getState().getList().get(0).getValue());
+ assertThat(n3.getState().getList().get(1).getAddress(), is(treasury.getScriptHash().toAddress()));
+ assertThat(n3.getState().getList().get(2).getInteger(), greaterThan(BigInteger.ZERO));
+
+ Notification n4 = n.get(4);
+ assertThat(n4.getContract(), is(treasury.getScriptHash()));
+ assertThat(n4.getEventName(), is("TokenReleased"));
+ assertThat(n4.getState().getList().get(0).getAddress(), is(neoToken.getScriptHash().toAddress()));
+ assertThat(n4.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n4.getState().getList().get(2).getInteger(), is(amount));
+
+ // Intent #3: Invoke bridge adapter to bridge.
+ Notification n5 = n.get(5); // Fee transfer
+ assertThat(n5.getContract(), is(gasToken.getScriptHash()));
+ assertThat(n5.getEventName(), is("Transfer"));
+ assertThat(n5.getState().getList().get(0).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n5.getState().getList().get(1).getAddress(), is(bridge.getScriptHash().toAddress()));
+ assertThat(n5.getState().getList().get(2).getInteger(), is(bridgeFee));
+
+ Notification n6 = n.get(6); // Token transfer
+ assertThat(n6.getContract(), is(neoToken.getScriptHash()));
+ assertThat(n6.getEventName(), is("Transfer"));
+ assertThat(n6.getState().getList().get(0).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n6.getState().getList().get(1).getAddress(), is(bridge.getScriptHash().toAddress()));
+ assertThat(n6.getState().getList().get(2).getInteger(), is(amount));
+
+ Notification n7 = n.get(7); // Deposit event
+ assertThat(n7.getContract(), is(bridge.getScriptHash()));
+ assertThat(n7.getEventName(), is("TokenDeposit"));
+ assertThat(new Hash160(reverseHexString(n7.getState().getList().get(0).getHexString())),
+ is(NeoToken.SCRIPT_HASH)
+ );
+ assertThat(n7.getState().getList().get(1).getAddress(), is(bridgeAdapter.getScriptHash().toAddress()));
+ assertThat(n7.getState().getList().get(2).getAddress(), is(recipient.toAddress()));
+ assertThat(n7.getState().getList().get(3).getInteger(), is(amount));
+
+ // Proposal executed event
+ Notification n8 = n.get(8);
+ assertThat(n8.getContract(), is(gov.getScriptHash()));
+ assertThat(n8.getEventName(), is("ProposalExecuted"));
+ assertThat(n8.getState().getList().get(0).getInteger(), is(BigInteger.ONE));
+ }
+
+ // endregion fund request intents execution using adapter
+ // region balance limit tests - native deposit
+
+ @Test
+ @Order(3)
+ public void execute_proposal_native_deposit_gas_remainder_at_limit() throws Throwable {
+ GasToken gasToken = new GasToken(neow3j);
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("nativeDepositFee");
+ BigInteger maxFee = bridgeAdapter.callFunctionReturningInt("maxFee");
+
+ BigInteger bridgeGasBalanceBefore = gasToken.getBalanceOf(bridge.getScriptHash());
+ assertThat(gasToken.getBalanceOf(bridgeAdapter.getScriptHash()), is(BigInteger.ZERO));
+
+ // Data from Neo X
+ Account proposer = bob;
+ BigInteger amount = gasToken.toFractions(BigDecimal.TEN);
+
+ // fee = 80969800
+ // fee to use in this test: bridge fee + maxFee
+
+ // 1. Create proposal
+ // This script is the same as used in the native deposit test, but with a different offchainUri, and the
+ // fee amount to send to the adapter set to bridgeFee+maxFee, so that after the deposit, an amount of GAS
+ // remains in the adapter that is equal the maxFee value (which is the limit of what is allowed to remain).
+ // offchainUri used: "native_deposit_gas_remainder_at_limit"
+ byte[] proposalScript = hexStringToByteArray(
+ "0f0c256e61746976655f6465706f7369745f6761735f72656d61696e6465725f61745f6c696d69741f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f0200ca9a3b0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02002d31010c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52");
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ Hash256 txHash = gov.invokeFunction(EXECUTE, integer(id)).signers(none(proposer),
+ ContractSigner.calledByEntry(bridgeAdapter.getScriptHash()).setRules(
+ new WitnessRule(WitnessAction.ALLOW,
+ new AndCondition(new ScriptHashCondition(gasToken.getScriptHash()),
+ new CalledByContractCondition(bridge.getScriptHash())
+ )
+ ))
+ ).sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ NeoApplicationLog.Execution exec = neow3j.getApplicationLog(txHash).send().getApplicationLog()
+ .getFirstExecution();
+ assertThat(exec.getState(), is(NeoVMStateType.HALT));
+ // Transfer+TokenReleased - treasury to adapter for the fee
+ // Transfer+TokenReleased - treasury to adapter for the amount
+ // Transfer+Transfer+NativeDeposit - bridge fee + amount transfers + deposit event
+ // ProposalExecuted - gs-gov event
+ assertThat(exec.getNotifications(), hasSize(8));
+ assertThat(exec.getNotifications().get(7).getEventName(), is("ProposalExecuted"));
+
+ BigInteger bridgeGasBalanceAfter = gasToken.getBalanceOf(bridge.getScriptHash());
+ // The amount to deposit is 10 GAS, so the bridge should hold the fee plus these 10 GAS more after the
+ // proposal execution.
+ BigInteger nativeDepositAmount = gasToken.toFractions(BigDecimal.TEN);
+ assertThat(bridgeGasBalanceAfter, is(bridgeGasBalanceBefore.add(bridgeFee).add(nativeDepositAmount)));
+
+ // Drain the remainder to clean the plate for other tests.
+ BigInteger adapterGasBalance = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ assertThat(adapterGasBalance, is(maxFee)); // The GAS remainder equal to the limit, i.e., maxFee.
+
+ Hash256 drainTx = gasToken.transfer(bridgeAdapter.getScriptHash(), alice.getScriptHash(), adapterGasBalance)
+ .signers(none(alice), ContractSigner.global(bridgeAdapter.getScriptHash()))
+ .sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(drainTx, neow3j);
+ assertThat(gasToken.getBalanceOf(bridgeAdapter.getScriptHash()), is(BigInteger.ZERO));
+ }
+
+ @Test
+ @Order(4)
+ public void execute_proposal_native_deposit_gas_remainder_limit_exceeded() throws Throwable {
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("nativeDepositFee");
+ BigInteger maxFee = bridgeAdapter.callFunctionReturningInt("maxFee");
+
+ // Data from Neo X
+ Account proposer = bob;
+
+ // 1. Create proposal
+ // This script is the same as used in the native deposit test, but with a different offchainUri, and the
+ // fee amount to send to the adapter set to bridgeFee+maxFee+1, so that after the deposit, the balance check
+ // for the remaining GAS balance in the adapter should abort the transaction as the remainder should not exceed
+ // the allowed limit.
+ // offchainUri used: "native_deposit_gas_remainder_limit_exceeded"
+ byte[] proposalScript = hexStringToByteArray(
+ "0f0c2b6e61746976655f6465706f7369745f6761735f72656d61696e6465725f6c696d69745f65786365656465641f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f0200ca9a3b0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
+ reverseHexString(toHexStringNoPrefix(bridgeFee.add(maxFee).add(BigInteger.ONE).toByteArray())) +
+ "0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52");
+ assertThat(toHexStringNoPrefix(proposalScript),
+ is("0f0c2b6e61746976655f6465706f7369745f6761735f72656d61696e6465725f6c696d69745f65786365656465641f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f0200ca9a3b0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
+ "012d3101" +
+ "0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52")
+ );
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ TransactionConfigurationException thrown = assertThrows(
+ TransactionConfigurationException.class, () -> gov.invokeFunction(EXECUTE, integer(id))
+ .signers(none(proposer), ContractSigner.global(bridgeAdapter.getScriptHash())).sign()
+ );
+ assertThat(thrown.getMessage(),
+ containsString("ABORTMSG is executed. Reason: unallowed token balance remainder")
+ );
+ }
+
+ // endregion
+ // region balance limit tests - token deposit
+
+ @Test
+ @Order(5)
+ public void execute_proposal_token_deposit_gas_remainder_at_limit() throws Throwable {
+ NeoToken neoToken = new NeoToken(neow3j);
+ BigInteger bridgeNeoBalanceBefore = neoToken.getBalanceOf(bridge.getScriptHash());
+ boolean bridgeHeldNeoBeforeDeposit =
+ bridgeNeoBalanceBefore.compareTo(BigInteger.ZERO) != 0;
+
+ GasToken gasToken = new GasToken(neow3j);
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("tokenDepositFee", hash160(neoToken.getScriptHash()));
+ BigInteger maxFee = bridgeAdapter.callFunctionReturningInt("maxFee");
+
+ assertThat(gasToken.getBalanceOf(bridgeAdapter.getScriptHash()), is(BigInteger.ZERO));
+
+ BigInteger bridgeGasBalanceBefore = gasToken.getBalanceOf(bridge.getScriptHash());
+
+ // Data from Neo X
+ Account proposer = charlie;
+
+ // 1. Create proposal
+ // This script is the same as used in the token deposit test, but with a different offchainUri, and the
+ // fee amount to send to the adapter set to bridgeFee+maxFee, so that after the deposit, an amount of GAS
+ // remains in the adapter that is equal the maxFee value (which is the limit of what is allowed to remain).
+ // offchainUri used: "token_deposit_gas_remainder_limit_exceeded"
+ byte[] proposalScript = hexStringToByteArray(
+ "0x0f0c24746f6b656e5f6465706f7369745f6761735f72656d61696e6465725f61745f6c696d69741f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f1a0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
+ // sending (bridge fee + maxFee) GAS to the adapter, so that the remainder will be exactly the
+ // limit. The execution should be successful in that case.
+ reverseHexString(toHexString(bridgeFee.add(maxFee).toByteArray())) +
+ "0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52"
+ );
+ assertThat(toHexStringNoPrefix(proposalScript),
+ is("0f0c24746f6b656e5f6465706f7369745f6761735f72656d61696e6465725f61745f6c696d69741f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f1a0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02002d31010c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52")
+ );
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ Hash256 txHash = gov.invokeFunction(EXECUTE, integer(id))
+ .signers(none(proposer), ContractSigner.global(bridgeAdapter.getScriptHash()))
+ .sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(txHash, neow3j);
+
+ NeoApplicationLog.Execution exec = neow3j.getApplicationLog(txHash).send().getApplicationLog()
+ .getFirstExecution();
+ assertThat(exec.getState(), is(NeoVMStateType.HALT));
+
+ // Transfer+TokenReleased - treasury to adapter for the fee
+ // Transfer+Transfer+TokenReleased - treasury to adapter for the amount (incl. Gas reward for treasury)
+ // Transfer - bridge fee
+ // Transfer(+Transfer)+TokenDeposit - neo to bridge (+ gas reward to bridge) +
+ // deposit event
+ // Note, there's no Gas reward for the adapter since NEO has to be held at least for 1 block for GAS rewards.
+ // ProposalExecuted - gs-gov event
+ int nrEvents;
+ if (bridgeHeldNeoBeforeDeposit) {
+ nrEvents = 10;
+ } else {
+ nrEvents = 9;
+ }
+ assertThat(exec.getNotifications(), hasSize(nrEvents));
+ assertThat(exec.getNotifications().get(nrEvents - 1).getEventName(), is("ProposalExecuted"));
+
+ BigInteger bridgeGasBalanceAfter = gasToken.getBalanceOf(bridge.getScriptHash());
+ // greater than because it might received GAS rewards
+ assertThat(bridgeGasBalanceAfter, greaterThan(bridgeGasBalanceBefore.add(bridgeFee)));
+ BigInteger bridgeNeoBalanceAfter = neoToken.getBalanceOf(bridge.getScriptHash());
+ assertThat(bridgeNeoBalanceAfter, is(bridgeNeoBalanceBefore.add(BigInteger.TEN)));
+
+ // Drain the remainder to clean the plate for other tests.
+ BigInteger adapterGasBalance = gasToken.getBalanceOf(bridgeAdapter.getScriptHash());
+ assertThat(adapterGasBalance, is(maxFee)); // The GAS remainder equal to the limit, i.e., maxFee.
+
+ Hash256 drainTx = gasToken.transfer(bridgeAdapter.getScriptHash(), alice.getScriptHash(), adapterGasBalance)
+ .signers(none(alice), ContractSigner.global(bridgeAdapter.getScriptHash()))
+ .sign().send().getSendRawTransaction().getHash();
+ waitUntilTransactionIsExecuted(drainTx, neow3j);
+ assertThat(gasToken.getBalanceOf(bridgeAdapter.getScriptHash()), is(BigInteger.ZERO));
+ }
+
+ @Test
+ @Order(6)
+ public void execute_proposal_token_deposit_gas_remainder_limit_exceeded() throws Throwable {
+ NeoToken neoToken = new NeoToken(neow3j);
+ BigInteger bridgeFee = bridge.callFunctionReturningInt("tokenDepositFee", hash160(neoToken.getScriptHash()));
+ BigInteger adaptersMaxFee = bridgeAdapter.callFunctionReturningInt("maxFee");
+
+ // Data from Neo X
+ Account proposer = charlie;
+
+ // 1. Create proposal
+ // This script is the same as used in the token deposit test, but with a different offchainUri, and the
+ // bridge fee set to bridgeFee+maxFee+1, so that after the deposit, the balance check for the remaining GAS
+ // balance in the adapter should abort the transaction as the remainder should not exceed the allowed limit.
+ // offchainUri: "token_deposit_gas_remainder_limit_exceeded"
+ byte[] proposalScript = hexStringToByteArray(
+ "0f0c2a746f6b656e5f6465706f7369745f6761735f72656d61696e6465725f6c696d69745f65786365656465641f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f1a0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
+ // sending (bridge fee + maxFee + 1) GAS to the adapter, so that the remainder will exceed
+ // the limit by 1. The execution should fail and the tx should abort.
+ reverseHexString(toHexString(bridgeFee.add(adaptersMaxFee).add(BigInteger.ONE).toByteArray())) +
+ "0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52"
+ );
+ assertThat(toHexStringNoPrefix(proposalScript),
+ is("0f0c2a746f6b656e5f6465706f7369745f6761735f72656d61696e6465725f6c696d69745f65786365656465641f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f1a0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02" +
+ "012d3101" +
+ "0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52")
+ );
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ TransactionConfigurationException thrown = assertThrows(
+ TransactionConfigurationException.class, () -> gov.invokeFunction(EXECUTE, integer(id))
+ .signers(none(proposer), ContractSigner.global(bridgeAdapter.getScriptHash())).sign()
+ );
+ assertThat(thrown.getMessage(),
+ containsString("ABORTMSG is executed. Reason: unallowed token balance remainder")
+ );
+ }
+
+ @Test
+ @Order(7)
+ public void execute_proposal_token_deposit_remaining_tokens() throws Throwable {
+ // Data from Neo X
+ Account proposer = charlie;
+ BigInteger amount = BigInteger.TEN; // That's the amount used for the bridge() function in the script below.
+
+ // 1. Create proposal
+ // This script is the same as used in the token deposit test, but with a different offchainUri, and the
+ // amount to release from the treasury to the amount+1, so that after the deposit, the balance check for the
+ // remaining NEO balance in the adapter should abort the transaction as the remainder should not exceed the
+ // allowed limit which is 0 for non-GAS tokens.
+ // offchainUri: "token_deposit_remaining_tokens"
+ byte[] proposalScript = hexStringToByteArray(
+ "0x0f0c1e746f6b656e5f6465706f7369745f72656d61696e696e675f746f6b656e731f1a0c14905" +
+ reverseHexString(toHexString(amount.add(BigInteger.ONE).toByteArray())) +
+ "f308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "14c01f1b0c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14" +
+ bridgeAdapterHashLittleEndianHex +
+ "0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c14" +
+ gsGovHashLittleEndianHex +
+ "41627d5b52");
+
+ TransactionBuilder b = new TransactionBuilder(neow3j).script(proposalScript);
+ int id = TestHelper.sendAndEndorseProposal(gov, neow3j, proposer, alice, b);
+
+ // 2. Skip to voting phase and vote
+ ext.fastForwardOneBlock(PHASE_LENGTH);
+ voteForProposal(gov, neow3j, id, alice);
+ voteForProposal(gov, neow3j, id, charlie);
+ voteForProposal(gov, neow3j, id, eve);
+
+ // 3. Skip till after vote and queued phase, then execute.
+ ext.fastForwardOneBlock(PHASE_LENGTH + PHASE_LENGTH);
+ TransactionConfigurationException thrown = assertThrows(
+ TransactionConfigurationException.class, () -> gov.invokeFunction(EXECUTE, integer(id))
+ .signers(none(proposer), ContractSigner.global(bridgeAdapter.getScriptHash())).sign()
+ );
+ assertThat(thrown.getMessage(),
+ containsString("ABORTMSG is executed. Reason: unallowed token balance remainder")
+ );
+ }
+
+ // endregion
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/CompilationHelper.java b/src/test/java/com/axlabs/neo/grantshares/util/CompilationHelper.java
new file mode 100644
index 0000000..1fbbbfe
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/CompilationHelper.java
@@ -0,0 +1,49 @@
+package com.axlabs.neo.grantshares.util;
+
+import io.neow3j.compiler.CompilationUnit;
+import io.neow3j.contract.NefFile;
+import io.neow3j.protocol.ObjectMapperFactory;
+import io.neow3j.protocol.core.response.ContractManifest;
+import io.neow3j.serialization.exceptions.DeserializationException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import static io.neow3j.contract.ContractUtils.writeContractManifestFile;
+import static io.neow3j.contract.ContractUtils.writeNefFile;
+
+public class CompilationHelper {
+
+ public static void writeNefAndManifestFiles(CompilationUnit compUnit) throws IOException {
+ // Write contract (compiled, NEF) to the disk
+ Path buildNeow3jPath = Paths.get("build", "neow3j");
+ buildNeow3jPath.toFile().mkdirs();
+ writeNefFile(compUnit.getNefFile(), compUnit.getManifest().getName(), buildNeow3jPath);
+
+ // Write manifest to the disk
+ writeContractManifestFile(compUnit.getManifest(), buildNeow3jPath);
+ }
+
+ // endregion compilation
+ // region read compilation output
+
+ static NefFile readNefFile(String contractName) throws IOException, DeserializationException {
+ File contractNefFile = Paths.get("build", "neow3j", contractName + ".nef").toFile();
+ return NefFile.readFromFile(contractNefFile);
+ }
+
+ static ContractManifest readManifest(String contractName) throws IOException {
+ File contractManifestFile = Paths.get("build", "neow3j", contractName + ".manifest.json").toFile();
+ ContractManifest manifest;
+ try (FileInputStream s = new FileInputStream(contractManifestFile)) {
+ manifest = ObjectMapperFactory.getObjectMapper().readValue(s, ContractManifest.class);
+ }
+ return manifest;
+ }
+
+ // endregion read compilation output
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
index 24da51c..5bf0a62 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesGovContract.java
@@ -42,12 +42,12 @@ public Map getParameters() throws IOException, UnexpectedRet
.getMap();
return map.entrySet().stream().collect(Collectors.toMap(
i -> i.getKey().getString(),
- i -> i.getValue().getInteger()));
+ i -> i.getValue().getInteger()
+ ));
}
public ProposalStruct getProposal(int id) throws IOException, UnexpectedReturnTypeException {
- List list = callInvokeFunction(getMethodName(), asList(integer(id))).getInvocationResult().getStack()
- .get(0).getList();
+ List list = callInvokeFunction(getMethodName(), asList(integer(id))).getInvocationResult().getStack().get(0).getList();
return new ProposalStruct(list);
}
@@ -78,13 +78,15 @@ public boolean isPaused() throws IOException, UnexpectedReturnTypeException {
public TransactionBuilder createProposal(Hash160 proposer, String offchainUri, int linkedProposal,
ContractParameter... intents) {
return invokeFunction(getMethodName(), hash160(proposer), array(asList(intents)),
- string(offchainUri), integer(linkedProposal));
+ string(offchainUri), integer(linkedProposal)
+ );
}
public TransactionBuilder createProposal(Hash160 proposer, String offchainUri, int linkedProposal,
int acceptanceRate, int quorum, ContractParameter... intents) {
return invokeFunction(getMethodName(), hash160(proposer), array(asList(intents)),
- string(offchainUri), integer(linkedProposal), integer(acceptanceRate), integer(quorum));
+ string(offchainUri), integer(linkedProposal), integer(acceptanceRate), integer(quorum)
+ );
}
public TransactionBuilder endorseProposal(int id, Hash160 endorser) {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
index eb38608..450d96c 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/GrantSharesTreasuryContract.java
@@ -37,8 +37,9 @@ public Map getWhitelistedTokens() throws IOException {
Map map = callInvokeFunction(getMethodName())
.getInvocationResult().getStack().get(0).getMap();
return map.entrySet().stream().collect(Collectors.toMap(
- e -> Hash160.fromAddress(e.getKey().getAddress()),
- e -> e.getValue().getInteger())
+ e -> Hash160.fromAddress(e.getKey().getAddress()),
+ e -> e.getValue().getInteger()
+ )
);
}
@@ -91,11 +92,11 @@ public TransactionBuilder addFunder(Hash160 accountHash, ECPublicKey... publicKe
}
public int setFundersMultiSigThresholdRatio() throws IOException {
- return callFuncReturningInt(getMethodName()).intValue();
+ return callFunctionReturningInt(getMethodName()).intValue();
}
public int getFundersMultiSigThresholdRatio() throws IOException {
- return callFuncReturningInt(getMethodName()).intValue();
+ return callFunctionReturningInt(getMethodName()).intValue();
}
public TransactionBuilder removeFunder(Hash160 funderHash) {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java b/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
index 6823b6e..eab6f1e 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/IntentParam.java
@@ -24,12 +24,14 @@ public IntentParam(Hash160 targetContract, String method, ContractParameter... p
public static IntentParam releaseTokenProposal(Hash160 treasury, Hash160 token, Hash160 receiver,
BigInteger amount) {
return new IntentParam(treasury, "releaseTokens",
- hash160(token), hash160(receiver), integer(amount));
+ hash160(token), hash160(receiver), integer(amount)
+ );
}
public static IntentParam changeParamProposal(Hash160 gov, String paramName, int value) {
return new IntentParam(gov, "changeParam",
- string(paramName), integer(value));
+ string(paramName), integer(value)
+ );
}
public static IntentParam addMemberProposal(Hash160 gov, ECPublicKey pubKey) {
@@ -75,4 +77,4 @@ public static IntentParam setFundersMultiSigThresholdRatioProposal(Hash160 treas
public static IntentParam drainProposal(Hash160 treasury) {
return new IntentParam(treasury, "drain");
}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java b/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
index 40d3fad..c2110b8 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/ProposalStruct.java
@@ -15,6 +15,7 @@ public class ProposalStruct {
public int linkedProposal;
public int acceptanceRate;
public int quorum;
+ public int quorumVotes;
public Hash160 endorser;
public BigInteger reviewEnd;
public BigInteger votingEnd;
@@ -35,22 +36,23 @@ public ProposalStruct(List list) {
list.get(2).getInteger().intValue(),
list.get(3).getInteger().intValue(),
list.get(4).getInteger().intValue(),
- list.get(5).getValue() == null ? null : Hash160.fromAddress(list.get(5).getAddress()),
- list.get(6).getInteger(),
+ list.get(5).getInteger().intValue(),
+ list.get(6).getValue() == null ? null : Hash160.fromAddress(list.get(6).getAddress()),
list.get(7).getInteger(),
list.get(8).getInteger(),
list.get(9).getInteger(),
- list.get(10).getBoolean(),
- list.get(11).getList().stream().map(i -> new IntentStruct(i.getList())).collect(Collectors.toList()),
- list.get(12).getString(),
- list.get(13).getInteger().intValue(),
+ list.get(10).getInteger(),
+ list.get(11).getBoolean(),
+ list.get(12).getList().stream().map(i -> new IntentStruct(i.getList())).collect(Collectors.toList()),
+ list.get(13).getString(),
list.get(14).getInteger().intValue(),
list.get(15).getInteger().intValue(),
- list.get(16).getMap() // voters
+ list.get(16).getInteger().intValue(),
+ list.get(17).getMap() // voters
);
}
- public ProposalStruct(int id, Hash160 proposer, int linkedProposal, int acceptanceRate, int quorum,
+ public ProposalStruct(int id, Hash160 proposer, int linkedProposal, int acceptanceRate, int quorum, int quorumVotes,
Hash160 endorser, BigInteger reviewEnd, BigInteger votingEnd, BigInteger timelockEnd, BigInteger expiration,
boolean executed, List intents, String offchainUri, int approve, int reject, int abstain,
Map voters) {
@@ -59,6 +61,7 @@ public ProposalStruct(int id, Hash160 proposer, int linkedProposal, int acceptan
this.linkedProposal = linkedProposal;
this.acceptanceRate = acceptanceRate;
this.quorum = quorum;
+ this.quorumVotes = quorumVotes;
this.endorser = endorser;
this.reviewEnd = reviewEnd;
this.votingEnd = votingEnd;
@@ -72,7 +75,8 @@ public ProposalStruct(int id, Hash160 proposer, int linkedProposal, int acceptan
this.abstain = abstain;
this.voters = voters.entrySet().stream().collect(Collectors.toMap(
e -> e.getKey().getAddress(),
- e -> e.getValue().getInteger().intValue()));
+ e -> e.getValue().getInteger().intValue()
+ ));
}
public static class IntentStruct {
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java b/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
index f333620..55fca45 100644
--- a/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
+++ b/src/test/java/com/axlabs/neo/grantshares/util/TestHelper.java
@@ -4,18 +4,15 @@
import io.neow3j.contract.SmartContract;
import io.neow3j.crypto.ECKeyPair;
import io.neow3j.protocol.Neow3j;
-import io.neow3j.protocol.core.response.NeoApplicationLog;
import io.neow3j.transaction.AccountSigner;
import io.neow3j.transaction.TransactionBuilder;
import io.neow3j.types.CallFlags;
import io.neow3j.types.ContractParameter;
import io.neow3j.types.Hash160;
import io.neow3j.types.Hash256;
-import io.neow3j.types.NeoVMStateType;
import io.neow3j.utils.Await;
import io.neow3j.wallet.Account;
-import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
@@ -28,64 +25,9 @@
import static io.neow3j.types.ContractParameter.integer;
import static io.neow3j.types.ContractParameter.publicKey;
import static io.neow3j.types.ContractParameter.string;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
public class TestHelper {
- // Account names available in the neo-express config file.
- public static final String ALICE = "NM7Aky765FG8NhhwtxjXRx7jEL1cnw7PBP";
- public static final String BOB = "NZpsgXn9VQQoLexpuXJsrX8BsoyAhKUyiX";
- public static final String CHARLIE = "NdbtgSku2qLuwsBBzLx3FLtmmMdm32Ktor";
- public static final String DENISE = "NerDv9t8exrQRrP11jjvZKXzSXvTnmfDTo";
- public static final String EVE = "NZ539Rd57v5NEtAdkHyFGaWj1uGt2DecUL";
- public static final String FLORIAN = "NRy5bp81kScYFZHLfMBXuubFfRyboVyu7G";
-
- // GrantSharesGov contract methods
- public static final String CREATE = "createProposal";
- public static final String GET_PROPOSAL = "getProposal";
- public static final String GET_PROPOSALS = "getProposals";
- public static final String GET_PARAMETER = "getParameter";
- public static final String GET_MEMBERS = "getMembers";
- public static final String GET_MEMBERS_COUNT = "getMembersCount";
- public static final String GET_PROPOSAL_COUNT = "getProposalCount";
- public static final String PAUSE = "pause";
- public static final String UNPAUSE = "unpause";
- public static final String IS_PAUSED = "isPaused";
- public static final String CALC_MEMBER_MULTI_SIG_ACC = "calcMembersMultiSigAccount";
- public static final String ENDORSE = "endorseProposal";
- public static final String VOTE = "vote";
- public static final String EXECUTE = "execute";
- public static final String CHANGE_PARAM = "changeParam";
- public static final String ADD_MEMBER = "addMember";
- public static final String REMOVE_MEMBER = "removeMember";
- public static final String UPDATE_CONTRACT = "updateContract";
-
- // events
- public static final String PROPOSAL_CREATED = "ProposalCreated";
- public static final String PROPOSAL_ENDORSED = "ProposalEndorsed";
- public static final String PROPOSAL_EXECUTED = "ProposalExecuted";
- public static final String VOTED = "Voted";
- public static final String MEMBER_ADDED = "MemberAdded";
- public static final String MEMBER_REMOVED = "MemberRemoved";
- public static final String PARAMETER_CHANGED = "ParameterChanged";
-
- // governance parameters values
- public static final int PHASE_LENGTH = 60; // seconds
- public static final int MIN_ACCEPTANCE_RATE = 50;
- public static final int MIN_QUORUM = 50;
- public static final int MULTI_SIG_THRESHOLD_RATIO = 50;
-
- // parameter names
- public static final String REVIEW_LENGTH_KEY = "review_len";
- public static final String VOTING_LENGTH_KEY = "voting_len";
- public static final String TIMELOCK_LENGTH_KEY = "timelock_len";
- public static final String EXPIRATION_LENGTH_KEY = "expiration_len";
- public static final String MIN_ACCEPTANCE_RATE_KEY = "min_accept_rate";
- public static final String MIN_QUORUM_KEY = "min_quorum";
- public static final String MULTI_SIG_THRESHOLD_KEY = "threshold";
-
static MessageDigest hasher;
static {
@@ -97,103 +39,142 @@ public class TestHelper {
}
public static ContractParameter prepareDeployParameter(Account... members) {
- return array(
- array(Arrays.stream(members)
- .map(m -> publicKey(m.getECKeyPair().getPublicKey().getEncoded(true)))
+ return array(array(Arrays.stream(members).map(m -> publicKey(m.getECKeyPair().getPublicKey().getEncoded(true)))
.collect(Collectors.toList())),
- array(
- REVIEW_LENGTH_KEY, PHASE_LENGTH * 1000,
- VOTING_LENGTH_KEY, PHASE_LENGTH * 1000,
- TIMELOCK_LENGTH_KEY, PHASE_LENGTH * 1000,
- EXPIRATION_LENGTH_KEY, PHASE_LENGTH * 1000,
- MIN_ACCEPTANCE_RATE_KEY, MIN_ACCEPTANCE_RATE,
- MIN_QUORUM_KEY, MIN_QUORUM,
- MULTI_SIG_THRESHOLD_KEY, MULTI_SIG_THRESHOLD_RATIO
+ array(ParameterNames.REVIEW_LENGTH_KEY, ParameterValues.PHASE_LENGTH * 1000,
+ ParameterNames.VOTING_LENGTH_KEY, ParameterValues.PHASE_LENGTH * 1000,
+ ParameterNames.TIMELOCK_LENGTH_KEY, ParameterValues.PHASE_LENGTH * 1000,
+ ParameterNames.EXPIRATION_LENGTH_KEY, ParameterValues.PHASE_LENGTH * 1000,
+ ParameterNames.MIN_ACCEPTANCE_RATE_KEY, ParameterValues.MIN_ACCEPTANCE_RATE,
+ ParameterNames.MIN_QUORUM_KEY, ParameterValues.MIN_QUORUM,
+ ParameterNames.MULTI_SIG_THRESHOLD_KEY, ParameterValues.MULTI_SIG_THRESHOLD_RATIO
)
);
}
- public static Hash256 createSimpleProposal(SmartContract contract, Account proposer,
- String offchainUri) throws Throwable {
-
- return contract.invokeFunction(CREATE, hash160(proposer),
- array(
- array(
- NeoToken.SCRIPT_HASH,
- "balanceOf",
- array(new Hash160(defaultAccountScriptHash())),
- CallFlags.ALL.getValue()
- )
- ),
- string(offchainUri),
- integer(-1))
- .signers(AccountSigner.calledByEntry(proposer))
- .sign().send().getSendRawTransaction().getHash();
- }
+ public static Hash256 createSimpleProposal(SmartContract contract, Account proposer, String offchainUri)
+ throws Throwable {
+ return contract.invokeFunction(GovernanceMethods.CREATE, hash160(proposer),
+ array(array(NeoToken.SCRIPT_HASH, "balanceOf", array(new Hash160(defaultAccountScriptHash())),
+ CallFlags.ALL.getValue()
+ )), string(offchainUri), integer(-1)
+ )
+ .signers(AccountSigner.calledByEntry(proposer)).sign().send().getSendRawTransaction().getHash();
+ }
public static int createAndEndorseProposal(GrantSharesGovContract gov, Neow3j neow3j, Account proposer,
- Account endorser, ContractParameter intents, String offchainUri) throws Throwable {
- TransactionBuilder b = gov.invokeFunction(CREATE, hash160(proposer), intents, string(offchainUri),
- integer(-1));
+ Account endorser, ContractParameter intents, String offchainUri)
+ throws Throwable {
+ TransactionBuilder b = gov.invokeFunction(GovernanceMethods.CREATE, hash160(proposer), intents,
+ string(offchainUri), integer(-1)
+ );
return sendAndEndorseProposal(gov, neow3j, proposer, endorser, b);
}
public static int createAndEndorseProposal(GrantSharesGovContract gov, Neow3j neow3j, Account proposer,
Account endorser, ContractParameter intents, String offchainUri, int acceptanceRate, int quorum)
throws Throwable {
- TransactionBuilder b = gov.invokeFunction(CREATE, hash160(proposer), intents, string(offchainUri),
- integer(-1), integer(acceptanceRate), integer(quorum));
+ TransactionBuilder b = gov.invokeFunction(GovernanceMethods.CREATE, hash160(proposer), intents,
+ string(offchainUri), integer(-1), integer(acceptanceRate), integer(quorum)
+ );
return sendAndEndorseProposal(gov, neow3j, proposer, endorser, b);
}
- private static int sendAndEndorseProposal(GrantSharesGovContract gov, Neow3j neow3j, Account proposer,
- Account endorser, TransactionBuilder b) throws Throwable {
- Hash256 tx = b.signers(AccountSigner.calledByEntry(proposer))
- .sign().send().getSendRawTransaction().getHash();
+ public static int sendAndEndorseProposal(GrantSharesGovContract gov, Neow3j neow3j, Account proposer,
+ Account endorser, TransactionBuilder b)
+ throws Throwable {
+ Hash256 tx = b.signers(AccountSigner.calledByEntry(proposer)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
- int id = neow3j.getApplicationLog(tx).send().getApplicationLog()
- .getExecutions().get(0).getStack().get(0).getInteger().intValue();
+ int id = neow3j.getApplicationLog(tx).send().getApplicationLog().getExecutions().get(0).getStack().get(0)
+ .getInteger().intValue();
// 2. endorse proposal
- tx = gov.invokeFunction(ENDORSE, integer(id), hash160(endorser))
- .signers(AccountSigner.calledByEntry(endorser))
- .sign().send().getSendRawTransaction().getHash();
+ tx = gov.invokeFunction(GovernanceMethods.ENDORSE, integer(id), hash160(endorser))
+ .signers(AccountSigner.calledByEntry(endorser)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
return id;
}
- public static void voteForProposal(GrantSharesGovContract gov, Neow3j neow3j, int id,
- Account endorserAndVoter) throws Throwable {
- Hash256 tx = gov.invokeFunction(VOTE, integer(id), integer(1), hash160(endorserAndVoter))
- .signers(AccountSigner.calledByEntry(endorserAndVoter))
- .sign().send().getSendRawTransaction().getHash();
+ public static void voteForProposal(GrantSharesGovContract gov, Neow3j neow3j, int id, Account endorserAndVoter)
+ throws Throwable {
+ Hash256 tx = gov.invokeFunction(GovernanceMethods.VOTE, integer(id), integer(1), hash160(endorserAndVoter))
+ .signers(AccountSigner.calledByEntry(endorserAndVoter)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
}
public static void voteForProposal(GrantSharesGovContract gov, Neow3j neow3j, int id, int vote,
- Account endorserAndVoter) throws Throwable {
- Hash256 tx = gov.invokeFunction(VOTE, integer(id), integer(vote),
- hash160(endorserAndVoter))
- .signers(AccountSigner.calledByEntry(endorserAndVoter))
- .sign().send().getSendRawTransaction().getHash();
+ Account endorserAndVoter)
+ throws Throwable {
+ Hash256 tx = gov.invokeFunction(GovernanceMethods.VOTE, integer(id), integer(vote), hash160(endorserAndVoter))
+ .signers(AccountSigner.calledByEntry(endorserAndVoter)).sign().send().getSendRawTransaction().getHash();
Await.waitUntilTransactionIsExecuted(tx, neow3j);
}
public static Account createMultiSigAccount(int threshold, Account... accounts) {
- List pubKeys = Arrays.stream(accounts)
- .map(a -> a.getECKeyPair().getPublicKey())
+ List pubKeys = Arrays.stream(accounts).map(a -> a.getECKeyPair().getPublicKey())
.collect(Collectors.toList());
return Account.createMultiSigAccount(pubKeys, threshold);
}
- public static void assertAborted(Hash256 tx, String expectedError, Neow3j neow3j) throws IOException {
- Await.waitUntilTransactionIsExecuted(tx, neow3j);
- NeoApplicationLog.Execution e = neow3j.getApplicationLog(tx).send().getApplicationLog().getExecutions().get(0);
- assertThat(e.getState(), is(NeoVMStateType.FAULT));
- String exception = e.getNotifications().get(0).getState().getList().get(0).getString();
- assertThat(exception, containsString(expectedError));
+ public static class Members {
+ // Account names available in the neo-express config file.
+ public static final String ALICE = "NM7Aky765FG8NhhwtxjXRx7jEL1cnw7PBP";
+ public static final String BOB = "NZpsgXn9VQQoLexpuXJsrX8BsoyAhKUyiX";
+ public static final String CHARLIE = "NdbtgSku2qLuwsBBzLx3FLtmmMdm32Ktor";
+ public static final String DENISE = "NerDv9t8exrQRrP11jjvZKXzSXvTnmfDTo";
+ public static final String EVE = "NZ539Rd57v5NEtAdkHyFGaWj1uGt2DecUL";
+ public static final String FLORIAN = "NRy5bp81kScYFZHLfMBXuubFfRyboVyu7G";
+ }
+
+ public static class GovernanceMethods {
+ public static final String ADD_MEMBER = "addMember";
+ public static final String CALC_MEMBER_MULTI_SIG_ACC = "calcMembersMultiSigAccount";
+ public static final String CHANGE_PARAM = "changeParam";
+ public static final String CREATE = "createProposal";
+ public static final String ENDORSE = "endorseProposal";
+ public static final String EXECUTE = "execute";
+ public static final String GET_MEMBERS = "getMembers";
+ public static final String GET_MEMBERS_COUNT = "getMembersCount";
+ public static final String GET_PARAMETER = "getParameter";
+ public static final String GET_PROPOSAL = "getProposal";
+ public static final String GET_PROPOSALS = "getProposals";
+ public static final String GET_PROPOSAL_COUNT = "getProposalCount";
+ public static final String IS_PAUSED = "isPaused";
+ public static final String PAUSE = "pause";
+ public static final String REMOVE_MEMBER = "removeMember";
+ public static final String UNPAUSE = "unpause";
+ public static final String UPDATE_CONTRACT = "updateContract";
+ public static final String VOTE = "vote";
+ }
+
+ public static class Events {
+ public static final String MEMBER_ADDED = "MemberAdded";
+ public static final String MEMBER_REMOVED = "MemberRemoved";
+ public static final String PARAMETER_CHANGED = "ParameterChanged";
+ public static final String PROPOSAL_CREATED = "ProposalCreated";
+ public static final String PROPOSAL_ENDORSED = "ProposalEndorsed";
+ public static final String PROPOSAL_EXECUTED = "ProposalExecuted";
+ public static final String VOTED = "Voted";
}
+
+ public static class ParameterNames {
+ public static final String EXPIRATION_LENGTH_KEY = "expiration_len";
+ public static final String MIN_ACCEPTANCE_RATE_KEY = "min_accept_rate";
+ public static final String MIN_QUORUM_KEY = "min_quorum";
+ public static final String MULTI_SIG_THRESHOLD_KEY = "threshold";
+ public static final String REVIEW_LENGTH_KEY = "review_len";
+ public static final String TIMELOCK_LENGTH_KEY = "timelock_len";
+ public static final String VOTING_LENGTH_KEY = "voting_len";
+ }
+
+ public static class ParameterValues {
+ public static final int MIN_ACCEPTANCE_RATE = 50;
+ public static final int MIN_QUORUM = 50;
+ public static final int MULTI_SIG_THRESHOLD_RATIO = 50;
+ public static final int PHASE_LENGTH = 60; // seconds
+ }
+
}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV2.java b/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV2.java
new file mode 100644
index 0000000..83b203f
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV2.java
@@ -0,0 +1,122 @@
+package com.axlabs.neo.grantshares.util.contracts;
+
+import io.neow3j.devpack.ByteString;
+import io.neow3j.devpack.Hash160;
+import io.neow3j.devpack.Storage;
+import io.neow3j.devpack.annotations.DisplayName;
+import io.neow3j.devpack.annotations.OnDeployment;
+import io.neow3j.devpack.annotations.OnNEP17Payment;
+import io.neow3j.devpack.annotations.Permission;
+import io.neow3j.devpack.annotations.Safe;
+import io.neow3j.devpack.annotations.Struct;
+import io.neow3j.devpack.contracts.FungibleToken;
+import io.neow3j.devpack.contracts.GasToken;
+import io.neow3j.devpack.contracts.NeoToken;
+import io.neow3j.devpack.contracts.StdLib;
+import io.neow3j.devpack.events.Event3Args;
+import io.neow3j.devpack.events.Event4Args;
+
+import static io.neow3j.devpack.Helper.abort;
+import static io.neow3j.devpack.Runtime.getCallingScriptHash;
+import static io.neow3j.devpack.Runtime.getExecutingScriptHash;
+import static io.neow3j.devpack.Storage.getReadOnlyContext;
+import static io.neow3j.devpack.Storage.getStorageContext;
+
+/**
+ * This is a test contract to mimic the behavior of the bridge contract.
+ */
+@Permission(contract = "*", methods = "*")
+public class TestBridgeV2 {
+
+ private static final int FEE_KEY = 0x00;
+
+ // @EventParameterNames({"From", "Recipient", "Amount"}) // Requires neow3j v3.23.0
+ @DisplayName("GasDeposit")
+ public static Event3Args gasDeposit;
+
+ // @EventParameterNames({"From", "Recipient", "Amount"}) // Requires neow3j v3.23.0
+ @DisplayName("TokenDeposit")
+ public static Event4Args tokenDeposit;
+
+ @OnDeployment
+ public static void deploy(Object data, boolean update) {
+ if (!update) {
+ Storage.put(getStorageContext(), FEE_KEY, (int) data);
+ }
+ }
+
+ @OnNEP17Payment
+ public static void onNEP17Payment(Hash160 from, int amount, Object data) {
+ Hash160 callingScriptHash = getCallingScriptHash();
+ if (callingScriptHash.equals(new GasToken().getHash())) {
+ if (from == null) {
+ // Accept Gas rewards from holding neo.
+ return;
+ } else if (data == null) {
+ return;
+ } else {
+ abort("No data accepted");
+ }
+ return;
+ } else if (callingScriptHash.equals(new NeoToken().getHash())) {
+ if (data != null) {
+ abort("No data accepted");
+ }
+ return;
+ } else {
+ abort("Unsupported token");
+ }
+ }
+
+ // This dummy struct is used to imitate the bridge's call to the native StdLib contract when deserializing the
+ // stored bridge data upon fetching the fee value.
+ @Struct
+ private static class StructWithValueOne {
+ public int one;
+
+ StructWithValueOne() {
+ one = 1;
+ }
+ }
+
+ // Returns 1, but includes a call to StdLib for testing purposes to imitate the call to StdLib that the bridge does.
+ private static int getOneWithStdLibCall() {
+ return ((StructWithValueOne) new StdLib().deserialize(
+ new ByteString(new byte[]{0x40, 0x01, 0x21, 0x01, 0x01}))).one;
+ }
+
+ @Safe
+ public static int gasDepositFee() {
+ return Storage.getInt(getReadOnlyContext(), FEE_KEY) * getOneWithStdLibCall();
+ }
+
+ public static void depositGas(Hash160 from, Hash160 to, int amountIncludingFee, int maxFee) {
+ if (gasDepositFee() > maxFee) abort("insufficient max fee");
+
+ Hash160 executingScriptHash = getExecutingScriptHash();
+
+ if (!new GasToken().transfer(from, executingScriptHash, amountIncludingFee, null)) {
+ abort("gas transfer failed");
+ }
+ gasDeposit.fire(from, to, amountIncludingFee - gasDepositFee());
+ }
+
+ @Safe
+ public static int tokenDepositFee(Hash160 token) {
+ return Storage.getInt(getReadOnlyContext(), FEE_KEY) * getOneWithStdLibCall();
+ }
+
+ public static void depositToken(Hash160 token, Hash160 from, Hash160 to, int amount, int maxFee) {
+ if (gasDepositFee() > maxFee) abort("insufficient max fee");
+
+ Hash160 executingScriptHash = getExecutingScriptHash();
+ if (!new GasToken().transfer(from, executingScriptHash, tokenDepositFee(token), null)) {
+ abort("fee transfer failed (token)");
+ }
+ if (!new FungibleToken(token).transfer(from, executingScriptHash, amount, null)) {
+ abort("native transfer failed");
+ }
+ tokenDeposit.fire(token, from, to, amount);
+ }
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV3.java b/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV3.java
new file mode 100644
index 0000000..0aa9866
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/contracts/TestBridgeV3.java
@@ -0,0 +1,126 @@
+package com.axlabs.neo.grantshares.util.contracts;
+
+import io.neow3j.devpack.ByteString;
+import io.neow3j.devpack.Hash160;
+import io.neow3j.devpack.Storage;
+import io.neow3j.devpack.annotations.DisplayName;
+import io.neow3j.devpack.annotations.OnDeployment;
+import io.neow3j.devpack.annotations.OnNEP17Payment;
+import io.neow3j.devpack.annotations.Permission;
+import io.neow3j.devpack.annotations.Safe;
+import io.neow3j.devpack.annotations.Struct;
+import io.neow3j.devpack.contracts.FungibleToken;
+import io.neow3j.devpack.contracts.GasToken;
+import io.neow3j.devpack.contracts.NeoToken;
+import io.neow3j.devpack.contracts.StdLib;
+import io.neow3j.devpack.events.Event3Args;
+import io.neow3j.devpack.events.Event4Args;
+
+import static io.neow3j.devpack.Helper.abort;
+import static io.neow3j.devpack.Runtime.getCallingScriptHash;
+import static io.neow3j.devpack.Runtime.getExecutingScriptHash;
+import static io.neow3j.devpack.Storage.getReadOnlyContext;
+import static io.neow3j.devpack.Storage.getStorageContext;
+
+/**
+ * This is a test contract to mimic the behavior of the bridge contract.
+ */
+@Permission(contract = "*", methods = "*")
+public class TestBridgeV3 {
+
+ private static final int FEE_KEY = 0x00;
+
+ // @EventParameterNames({"From", "Recipient", "Amount"}) // Requires neow3j v3.23.0
+ @DisplayName("NativeDeposit")
+ public static Event3Args nativeDeposit;
+
+ // @EventParameterNames({"From", "Recipient", "Amount"}) // Requires neow3j v3.23.0
+ @DisplayName("TokenDeposit")
+ public static Event4Args tokenDeposit;
+
+ @OnDeployment
+ public static void deploy(Object data, boolean update) {
+ if (!update) {
+ Storage.put(getStorageContext(), FEE_KEY, (int) data);
+ }
+ }
+
+ @OnNEP17Payment
+ public static void onNEP17Payment(Hash160 from, int amount, Object data) {
+ Hash160 callingScriptHash = getCallingScriptHash();
+ if (callingScriptHash.equals(new GasToken().getHash())) {
+ if (from == null) {
+ // Accept Gas rewards from holding neo.
+ return;
+ } else if (data == null) {
+ return;
+ } else {
+ abort("No data accepted");
+ }
+ return;
+ } else if (callingScriptHash.equals(new NeoToken().getHash())) {
+ if (data != null) {
+ abort("No data accepted");
+ }
+ return;
+ } else {
+ abort("Unsupported token");
+ }
+ }
+
+ // This dummy struct is used to imitate the bridge's call to the native StdLib contract when deserializing the
+ // stored bridge data upon fetching the fee value.
+ @Struct
+ private static class StructWithValueOne {
+ public int one;
+
+ StructWithValueOne() {
+ one = 1;
+ }
+ }
+
+ // Returns 1, but includes a call to StdLib for testing purposes to imitate the call to StdLib that the bridge does.
+ private static int getOneWithStdLibCall() {
+ return ((StructWithValueOne) new StdLib().deserialize(
+ new ByteString(new byte[]{0x40, 0x01, 0x21, 0x01, 0x01}))).one;
+ }
+
+ @Safe
+ public static int nativeDepositFee() {
+ return Storage.getInt(getReadOnlyContext(), FEE_KEY) * getOneWithStdLibCall();
+ }
+
+ public static void depositNative(Hash160 from, Hash160 to, int amount, int maxFee) {
+ if (nativeDepositFee() > maxFee) abort("insufficient max fee");
+
+ Hash160 executingScriptHash = getExecutingScriptHash();
+
+ if (!new GasToken().transfer(from, executingScriptHash, nativeDepositFee(), null)) {
+ abort("fee transfer failed");
+ }
+
+ if (!new GasToken().transfer(from, executingScriptHash, amount, null)) {
+ abort("native transfer failed");
+ }
+ nativeDeposit.fire(from, to, amount);
+ }
+
+ @Safe
+ public static int tokenDepositFee(Hash160 token) {
+ return Storage.getInt(getReadOnlyContext(), FEE_KEY) * getOneWithStdLibCall();
+ }
+
+ public static void depositToken(Hash160 token, Hash160 from, Hash160 to, int amount, int maxFee) {
+ if (nativeDepositFee() > maxFee) abort("insufficient max fee");
+
+ Hash160 executingScriptHash = getExecutingScriptHash();
+ if (!new GasToken().transfer(from, executingScriptHash, tokenDepositFee(token), null)) {
+ abort("fee transfer failed (token)");
+ }
+ if (!new FungibleToken(token).transfer(from, executingScriptHash, amount, null)) {
+ abort("native transfer failed");
+ }
+ tokenDeposit.fire(token, from, to, amount);
+ }
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilder.java b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilder.java
new file mode 100644
index 0000000..a77a0de
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilder.java
@@ -0,0 +1,125 @@
+package com.axlabs.neo.grantshares.util.proposal;
+
+import com.axlabs.neo.grantshares.util.TestHelper;
+import com.axlabs.neo.grantshares.util.proposal.intents.RequestForFunds;
+import io.neow3j.contract.GasToken;
+import io.neow3j.contract.NeoToken;
+import io.neow3j.script.InteropService;
+import io.neow3j.script.ScriptBuilder;
+import io.neow3j.types.CallFlags;
+import io.neow3j.types.Hash160;
+import io.neow3j.utils.ArrayUtils;
+import io.neow3j.wallet.Account;
+
+import java.math.BigInteger;
+
+import static io.neow3j.types.ContractParameter.hash160;
+import static io.neow3j.types.ContractParameter.integer;
+import static io.neow3j.types.ContractParameter.string;
+
+public class ProposalBuilder {
+
+ // region Request For Funds Proposal
+
+ /**
+ * Builds the script for creating a proposal that will release the provided Gas amount to the recipient on Neo X by
+ * using the native bridge.
+ *
+ * The intents include:
+ *
+ * Releasing the provided bridge fee amount in GAS tokens from the treasury to the bridge adapter.
+ * Releasing the requested GAS tokens from the treasury to the bridge adapter.
+ * Invoking the {@code bridge} function on the bridge adapter contract that will invoke the native bridge
+ * to deposit the corresponding amount to the provided address on Neo X.
+ *
+ *
+ * @param proposer the proposer account.
+ * @param data the proposal data.
+ * @param gov the GrantSharesGov contract hash.
+ * @param treasury the GrantSharesTreasury contract hash.
+ * @param adapter the GrantSharesAdapter contract hash.
+ * @param recipient the recipient address on Neo X.
+ * @param amount the amount of GAS tokens to be bridged.
+ * @param bridgeFee the fee to be paid to the bridge.
+ * @return the script to create a proposal for a fund request of Gas to an address on Neo X.
+ */
+ public static byte[] buildRequestForFundsTxScriptGas(Account proposer, ProposalData data, Hash160 gov,
+ Hash160 treasury, Hash160 adapter, Hash160 recipient, BigInteger amount, BigInteger bridgeFee) {
+ return buildRequestForFundsTxScript(GasToken.SCRIPT_HASH, proposer, data, gov, treasury, adapter, recipient,
+ amount, bridgeFee
+ );
+ }
+
+ /**
+ * Builds the script for creating a proposal that will release the provided NEO amount to the recipient on Neo X by
+ * using the native bridge.
+ *
+ * The intents include:
+ *
+ * Releasing the provided bridge fee amount in GAS tokens from the treasury to the bridge adapter.
+ * Releasing the requested NEO tokens from the treasury to the bridge adapter.
+ * Invoking the {@code bridge} function on the bridge adapter contract that will invoke the native bridge
+ * to deposit the corresponding amount to the provided address on Neo X.
+ *
+ *
+ * @param proposer the proposer account.
+ * @param data the proposal data.
+ * @param gov the GrantSharesGov contract hash.
+ * @param treasury the GrantSharesTreasury contract hash.
+ * @param adapter the GrantSharesAdapter contract hash.
+ * @param recipient the recipient address on Neo X.
+ * @param amount the amount of NEO tokens to be bridged.
+ * @param bridgeFee the fee to be paid to the bridge.
+ * @return the script to create a proposal for a fund request of Neo to an address on Neo X.
+ */
+ public static byte[] buildRequestForFundsTxScriptNeo(Account proposer, ProposalData data, Hash160 gov,
+ Hash160 treasury, Hash160 adapter, Hash160 recipient, BigInteger amount, BigInteger bridgeFee) {
+ return buildRequestForFundsTxScript(NeoToken.SCRIPT_HASH, proposer, data, gov, treasury, adapter, recipient,
+ amount, bridgeFee
+ );
+ }
+
+ private static byte[] buildRequestForFundsTxScript(Hash160 token, Account proposer, ProposalData data,
+ Hash160 gov, Hash160 treasury, Hash160 adapter, Hash160 recipient, BigInteger amount,
+ BigInteger bridgeFee) {
+ byte[] intentBytes = RequestForFunds.buildIntentsBytes(token, treasury, adapter, recipient, amount, bridgeFee);
+ return buildCreateProposalScript(data, gov, intentBytes, proposer);
+ }
+
+ // endregion
+ // region transaction script builder
+
+ /**
+ * Builds the script for creating a generic proposal on the GrantSharesGov contract.
+ *
+ * @param gov the GrantSharesGov contract hash.
+ * @param intentBytes the intents script.
+ * @param proposer the proposer of the proposal.
+ * @return the proposal creation script.
+ */
+ public static byte[] buildCreateProposalScript(ProposalData proposalData, Hash160 gov, byte[] intentBytes,
+ Account proposer) {
+
+ ScriptBuilder b1 = new ScriptBuilder();
+ int nrParams = 4; // proposer, intents, offchainUri, linkedProposal (reversed order of pushing params)
+ b1.pushParam(integer(proposalData.getLinkedProposal()));
+ b1.pushParam(string(proposalData.getOffChainUri()));
+ byte[] startBytes = b1.toArray();
+
+ ScriptBuilder b2 = new ScriptBuilder();
+ b2.pushParam(hash160(proposer));
+ b2.pushInteger(nrParams);
+ b2.pack();
+
+ b2.pushInteger(CallFlags.ALL.getValue());
+ b2.pushData(TestHelper.GovernanceMethods.CREATE);
+ b2.pushData(gov.toLittleEndianArray());
+ b2.sysCall(InteropService.SYSTEM_CONTRACT_CALL);
+ byte[] endBytes = b2.toArray();
+
+ return ArrayUtils.concatenate(startBytes, intentBytes, endBytes);
+ }
+
+ // endregion
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilderTest.java b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilderTest.java
new file mode 100644
index 0000000..87f4855
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalBuilderTest.java
@@ -0,0 +1,84 @@
+package com.axlabs.neo.grantshares.util.proposal;
+
+import io.neow3j.types.Hash160;
+import io.neow3j.wallet.Account;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+
+import static io.neow3j.utils.Numeric.hexStringToByteArray;
+import static io.neow3j.utils.Numeric.reverseHexString;
+import static io.neow3j.utils.Numeric.toHexString;
+import static io.neow3j.utils.Numeric.toHexStringNoPrefix;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+public class ProposalBuilderTest {
+
+ public static final Hash160 GS_GOV = new Hash160("0x2980dba54983777175780c59f64c59d2fbd5df48");
+ public static final Hash160 GS_TREASURY = new Hash160("0x95434943e07ab980dd9fbe4edc0edefb17a13517");
+ public static final Hash160 BRIDGE_ADAPTER = new Hash160("0x8e5266f736a4feec36a75378101bae1286e45bd2");
+
+ @Test
+ public void testBuildCreateProposalScript() {
+ Account proposer = Account.fromWIF("KzMdcC173uX5jYBEED3MuKVAAHWKq8DjuevMv416QcyH5Y5X1vYL");
+ ProposalData proposalData = new ProposalData("offchainUri", 12);
+
+ byte[] someIntentBytes = hexStringToByteArray("0x34125e87acd5984679");
+
+ // The intent bytes are random. This test just verifies that these bytes are included correctly and the
+ // prefix and suffix are correctly set.
+ byte[] createProposalScript = ProposalBuilder.buildCreateProposalScript(proposalData, GS_GOV, someIntentBytes,
+ proposer
+ );
+
+ //0x1c0c0b6f6666636861696e55726934125e87acd59846790c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c1448dfd5fbd2594cf6590c787571778349a5db802941627d5b52
+ String expectedScript = "0x1c" + // linked proposal
+ "0c" + "0b" + "6f6666636861696e557269" + // pushdata + size + offchain uri
+ toHexStringNoPrefix(someIntentBytes) +
+ "0c" + "14" + reverseHexString(toHexStringNoPrefix(proposer.getScriptHash().toArray())) +
+ "14" + "c0" + // 4 args + pack
+
+ "1f" + // call flags all
+ // pushdata + size + createProposal function
+ "0c" + "0e" + toHexStringNoPrefix("createProposal".getBytes()) +
+ // pushdata + size + governance contract
+ "0c" + "14" + reverseHexString(toHexStringNoPrefix(GS_GOV.toArray())) +
+ // syscall contract call
+ "41" + "627d5b52";
+ assertThat(toHexString(createProposalScript), is(expectedScript));
+ }
+
+ @Test
+ public void testRequestForFundsGas() {
+ Account proposer = Account.fromWIF("KzMdcC173uX5jYBEED3MuKVAAHWKq8DjuevMv416QcyH5Y5X1vYL");
+ Hash160 recipient = new Hash160("0x69ecca587293047be4c59159bf8bc399985c160d");
+ BigInteger amount = new BigInteger("1000000000");
+ BigInteger bridgeFee = new BigInteger("10000000");
+ ProposalData proposalData = new ProposalData("execute_proposal_with_bridge_adapter_gas", -1);
+
+ byte[] txScript = ProposalBuilder.buildRequestForFundsTxScriptGas(proposer, proposalData, GS_GOV, GS_TREASURY,
+ BRIDGE_ADAPTER, recipient, amount, bridgeFee
+ );
+ assertThat(toHexString(txScript),
+ is("0x0f0c28657865637574655f70726f706f73616c5f776974685f6272696467655f616461707465725f6761731f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14d25be48612ae1b107853a736ecfea436f766528e14c01f0200ca9a3b0c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14989b16363233ccc699c6a9a1840ab8cd1934d58214c01f0c0e63726561746550726f706f73616c0c1448dfd5fbd2594cf6590c787571778349a5db802941627d5b52")
+ );
+ }
+
+ @Test
+ public void testRequestForFundsNeo() {
+ Account proposer = Account.fromWIF("KzPJdAv8xXTMUTW94bzk77wUUZh49jWCgGtDhTVgn928mjcGR4kK");
+ Hash160 recipient = new Hash160("0x1cfb4032e4c5f394b8e5ec78f2cf148230af5090");
+ BigInteger amount = new BigInteger("10");
+ BigInteger bridgeFee = new BigInteger("10000000");
+ ProposalData proposalData = new ProposalData("execute_proposal_with_bridge_adapter_neo", 0);
+
+ byte[] txScript = ProposalBuilder.buildRequestForFundsTxScriptNeo(proposer, proposalData, GS_GOV, GS_TREASURY,
+ BRIDGE_ADAPTER, recipient, amount, bridgeFee
+ );
+ assertThat(toHexString(txScript),
+ is("0x100c28657865637574655f70726f706f73616c5f776974685f6272696467655f616461707465725f6e656f1f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14d25be48612ae1b107853a736ecfea436f766528e14c01f1a0c14d25be48612ae1b107853a736ecfea436f766528e0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c00c14c20704128f809d6f47f8596eafe0ea779538ddfa14c01f0c0e63726561746550726f706f73616c0c1448dfd5fbd2594cf6590c787571778349a5db802941627d5b52")
+ );
+ }
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalData.java b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalData.java
new file mode 100644
index 0000000..48fe4ed
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/proposal/ProposalData.java
@@ -0,0 +1,21 @@
+package com.axlabs.neo.grantshares.util.proposal;
+
+public class ProposalData {
+
+ private String offchainUri;
+ private int linkedProposal;
+
+ public ProposalData(String offchainUri, int linkedProposal) {
+ this.offchainUri = offchainUri;
+ this.linkedProposal = linkedProposal;
+ }
+
+ public int getLinkedProposal() {
+ return linkedProposal;
+ }
+
+ public String getOffChainUri() {
+ return offchainUri;
+ }
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFunds.java b/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFunds.java
new file mode 100644
index 0000000..ac8f102
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFunds.java
@@ -0,0 +1,81 @@
+package com.axlabs.neo.grantshares.util.proposal.intents;
+
+import io.neow3j.contract.GasToken;
+import io.neow3j.script.ScriptBuilder;
+import io.neow3j.types.CallFlags;
+import io.neow3j.types.Hash160;
+
+import java.math.BigInteger;
+
+import static io.neow3j.types.ContractParameter.hash160;
+import static io.neow3j.types.ContractParameter.integer;
+import static io.neow3j.types.ContractParameter.string;
+
+/**
+ * This class provides utility methods to build intents for fund request proposals in the GrantSharesAdapter contract.
+ */
+public class RequestForFunds {
+
+ /**
+ * This builds the required Intents for releasing the requested GAS tokens and bridging them to Neo X using
+ * the native bridge (via the GrantSharesAdapter).
+ *
+ * @param treasury the GrantSharesTreasury contract hash.
+ * @param bridgeAdapter the GrantSharesAdapter contract hash.
+ * @param bridgeFee the fee to be paid to the bridge.
+ * @param recipient the recipient of the GAS tokens on Neo X.
+ * @param amount the amount of GAS tokens to be bridged.
+ * @return the script bytes of the intents.
+ */
+ public static byte[] buildIntentsBytes(Hash160 token, Hash160 treasury, Hash160 bridgeAdapter, Hash160 recipient,
+ BigInteger amount, BigInteger bridgeFee) {
+
+ ScriptBuilder b = new ScriptBuilder();
+ // Replicate what happens in ScriptBuilder when pushing array(intents) (reversed order of pushing params)
+ pushAdapterBridgeIntent(b, token, bridgeAdapter, recipient, amount);
+ pushReleaseTokensIntent(b, token, treasury, bridgeAdapter, amount);
+ pushReleaseTokensIntent(b, GasToken.SCRIPT_HASH, treasury, bridgeAdapter, bridgeFee);
+ b.pushInteger(3);
+ b.pack();
+ return b.toArray();
+ }
+
+ private static void pushReleaseTokensIntent(ScriptBuilder b, Hash160 token, Hash160 from, Hash160 to,
+ BigInteger amount) {
+
+ // Replicate array(target, method, args, flags), i.e., ScriptBuilder.pushArray()
+ b.pushParam(integer(CallFlags.ALL.getValue()));
+
+ b.pushParam(integer(amount));
+ b.pushParam(hash160(to));
+ b.pushParam(hash160(token));
+ b.pushInteger(3);
+ b.pack();
+
+ b.pushParam(string("releaseTokens"));
+ b.pushParam(hash160(from));
+
+ b.pushInteger(4);
+ b.pack();
+ }
+
+ private static void pushAdapterBridgeIntent(ScriptBuilder b, Hash160 token, Hash160 bridgeAdaptor,
+ Hash160 recipient, BigInteger amount) {
+
+ // Replicate array(bridgeAdaptor, "bridge", [token, to, amount], CallFlags.ALL)
+ b.pushInteger(CallFlags.ALL.getValue());
+
+ b.pushInteger(amount);
+ b.pushParam(hash160(recipient));
+ b.pushParam(hash160(token));
+ b.pushInteger(3);
+ b.pack();
+
+ b.pushParam(string("bridge"));
+ b.pushParam(hash160(bridgeAdaptor));
+
+ b.pushInteger(4);
+ b.pack();
+ }
+
+}
diff --git a/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFundsTest.java b/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFundsTest.java
new file mode 100644
index 0000000..d766495
--- /dev/null
+++ b/src/test/java/com/axlabs/neo/grantshares/util/proposal/intents/RequestForFundsTest.java
@@ -0,0 +1,49 @@
+package com.axlabs.neo.grantshares.util.proposal.intents;
+
+import io.neow3j.contract.GasToken;
+import io.neow3j.contract.NeoToken;
+import io.neow3j.types.Hash160;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+
+import static io.neow3j.utils.Numeric.toHexString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+public class RequestForFundsTest {
+
+ private static final Hash160 TREASURY = new Hash160("0x95434943e07ab980dd9fbe4edc0edefb17a13517");
+ private static final Hash160 BRIDGE_ADAPTER = new Hash160("0x8e5266f736a4feec36a75378101bae1286e45bd2");
+
+ @Test
+ public void testIntentBytes_RequestForFunds_Neo() {
+ Hash160 recipient = new Hash160("0x1cfb4032e4c5f394b8e5ec78f2cf148230af5090");
+ BigInteger amount = new BigInteger("10");
+ BigInteger bridgeFee = new BigInteger("10000000");
+
+ byte[] intentBytes = RequestForFunds.buildIntentsBytes(NeoToken.SCRIPT_HASH, TREASURY, BRIDGE_ADAPTER,
+ recipient, amount, bridgeFee
+ );
+
+ String expectedIntents =
+ "0x1f1a0c149050af308214cff278ece5b894f3c5e43240fb1c0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c066272696467650c14d25be48612ae1b107853a736ecfea436f766528e14c01f1a0c14d25be48612ae1b107853a736ecfea436f766528e0c14f563ea40bc283d4d0e05c48ea305b3f2a07340ef13c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c0";
+ assertThat(toHexString(intentBytes), is(expectedIntents));
+ }
+
+ @Test
+ public void testIntentBytes_RequestForFunds_Gas() {
+ Hash160 recipient = new Hash160("0x69ecca587293047be4c59159bf8bc399985c160d");
+ BigInteger amount = new BigInteger("1000000000");
+ BigInteger bridgeFee = new BigInteger("10000000");
+
+ byte[] intentBytes = RequestForFunds.buildIntentsBytes(GasToken.SCRIPT_HASH, TREASURY, BRIDGE_ADAPTER,
+ recipient, amount, bridgeFee
+ );
+
+ String expectedIntents =
+ "0x1f0200ca9a3b0c140d165c9899c38bbf5991c5e47b04937258caec690c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c066272696467650c14d25be48612ae1b107853a736ecfea436f766528e14c01f0200ca9a3b0c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c01f02809698000c14d25be48612ae1b107853a736ecfea436f766528e0c14cf76e28bd0062c4a478ee35561011319f3cfa4d213c00c0d72656c65617365546f6b656e730c141735a117fbde0edc4ebe9fdd80b97ae04349439514c013c0";
+ assertThat(toHexString(intentBytes), is(expectedIntents));
+ }
+
+}
diff --git a/src/test/resources/GrantSharesGov.manifest.json b/src/test/resources/GrantSharesGov.manifest.json
new file mode 100644
index 0000000..f12c007
--- /dev/null
+++ b/src/test/resources/GrantSharesGov.manifest.json
@@ -0,0 +1,447 @@
+{
+ "name": "GrantSharesGov",
+ "groups": [],
+ "features": {},
+ "supportedstandards": [],
+ "abi": {
+ "methods": [
+ {
+ "name": "_deploy",
+ "parameters": [
+ {
+ "name": "data",
+ "type": "Any"
+ },
+ {
+ "name": "update",
+ "type": "Boolean"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 0,
+ "safe": false
+ },
+ {
+ "name": "getParameter",
+ "parameters": [
+ {
+ "name": "paramName",
+ "type": "String"
+ }
+ ],
+ "returntype": "Any",
+ "offset": 449,
+ "safe": true
+ },
+ {
+ "name": "getParameters",
+ "parameters": [],
+ "returntype": "Map",
+ "offset": 468,
+ "safe": true
+ },
+ {
+ "name": "getProposal",
+ "parameters": [
+ {
+ "name": "id",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Any",
+ "offset": 521,
+ "safe": true
+ },
+ {
+ "name": "getMembers",
+ "parameters": [],
+ "returntype": "Array",
+ "offset": 744,
+ "safe": true
+ },
+ {
+ "name": "getMembersCount",
+ "parameters": [],
+ "returntype": "Integer",
+ "offset": 790,
+ "safe": true
+ },
+ {
+ "name": "getProposalCount",
+ "parameters": [],
+ "returntype": "Integer",
+ "offset": 815,
+ "safe": true
+ },
+ {
+ "name": "getProposals",
+ "parameters": [
+ {
+ "name": "page",
+ "type": "Integer"
+ },
+ {
+ "name": "itemsPerPage",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Any",
+ "offset": 842,
+ "safe": true
+ },
+ {
+ "name": "isPaused",
+ "parameters": [],
+ "returntype": "Boolean",
+ "offset": 1064,
+ "safe": true
+ },
+ {
+ "name": "calcMembersMultiSigAccount",
+ "parameters": [],
+ "returntype": "Hash160",
+ "offset": 1086,
+ "safe": true
+ },
+ {
+ "name": "calcMembersMultiSigAccountThreshold",
+ "parameters": [],
+ "returntype": "Integer",
+ "offset": 1103,
+ "safe": true
+ },
+ {
+ "name": "createProposal",
+ "parameters": [
+ {
+ "name": "proposer",
+ "type": "Hash160"
+ },
+ {
+ "name": "intents",
+ "type": "Array"
+ },
+ {
+ "name": "offchainUri",
+ "type": "String"
+ },
+ {
+ "name": "linkedProposal",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Integer",
+ "offset": 1262,
+ "safe": false
+ },
+ {
+ "name": "createProposal",
+ "parameters": [
+ {
+ "name": "proposer",
+ "type": "Hash160"
+ },
+ {
+ "name": "intents",
+ "type": "Array"
+ },
+ {
+ "name": "offchainUri",
+ "type": "String"
+ },
+ {
+ "name": "linkedProposal",
+ "type": "Integer"
+ },
+ {
+ "name": "acceptanceRate",
+ "type": "Integer"
+ },
+ {
+ "name": "quorum",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Integer",
+ "offset": 1338,
+ "safe": false
+ },
+ {
+ "name": "endorseProposal",
+ "parameters": [
+ {
+ "name": "id",
+ "type": "Integer"
+ },
+ {
+ "name": "endorser",
+ "type": "Hash160"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 2057,
+ "safe": false
+ },
+ {
+ "name": "vote",
+ "parameters": [
+ {
+ "name": "id",
+ "type": "Integer"
+ },
+ {
+ "name": "vote",
+ "type": "Integer"
+ },
+ {
+ "name": "voter",
+ "type": "Hash160"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 2530,
+ "safe": false
+ },
+ {
+ "name": "execute",
+ "parameters": [
+ {
+ "name": "id",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Array",
+ "offset": 2937,
+ "safe": false
+ },
+ {
+ "name": "changeParam",
+ "parameters": [
+ {
+ "name": "paramKey",
+ "type": "String"
+ },
+ {
+ "name": "value",
+ "type": "Integer"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 3481,
+ "safe": false
+ },
+ {
+ "name": "addMember",
+ "parameters": [
+ {
+ "name": "memberPubKey",
+ "type": "PublicKey"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 3924,
+ "safe": false
+ },
+ {
+ "name": "removeMember",
+ "parameters": [
+ {
+ "name": "memberPubKey",
+ "type": "PublicKey"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 4083,
+ "safe": false
+ },
+ {
+ "name": "updateContract",
+ "parameters": [
+ {
+ "name": "nef",
+ "type": "ByteArray"
+ },
+ {
+ "name": "manifest",
+ "type": "String"
+ },
+ {
+ "name": "data",
+ "type": "Any"
+ }
+ ],
+ "returntype": "Void",
+ "offset": 4241,
+ "safe": false
+ },
+ {
+ "name": "pause",
+ "parameters": [],
+ "returntype": "Void",
+ "offset": 4287,
+ "safe": false
+ },
+ {
+ "name": "unpause",
+ "parameters": [],
+ "returntype": "Void",
+ "offset": 4407,
+ "safe": false
+ },
+ {
+ "name": "abortIfPaused",
+ "parameters": [],
+ "returntype": "Void",
+ "offset": 4623,
+ "safe": false
+ },
+ {
+ "name": "_initialize",
+ "parameters": [],
+ "returntype": "Void",
+ "offset": 4987,
+ "safe": false
+ }
+ ],
+ "events": [
+ {
+ "name": "UpdatingContract",
+ "parameters": []
+ },
+ {
+ "name": "ProposalEndorsed",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Integer"
+ },
+ {
+ "name": "arg2",
+ "type": "Hash160"
+ }
+ ]
+ },
+ {
+ "name": "ProposalMigrated",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Integer"
+ }
+ ]
+ },
+ {
+ "name": "MemberRemoved",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Hash160"
+ }
+ ]
+ },
+ {
+ "name": "Error",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "String"
+ },
+ {
+ "name": "arg2",
+ "type": "String"
+ }
+ ]
+ },
+ {
+ "name": "Voted",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Integer"
+ },
+ {
+ "name": "arg2",
+ "type": "Hash160"
+ },
+ {
+ "name": "arg3",
+ "type": "Integer"
+ }
+ ]
+ },
+ {
+ "name": "ParameterChanged",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "String"
+ },
+ {
+ "name": "arg2",
+ "type": "Integer"
+ }
+ ]
+ },
+ {
+ "name": "ProposalExecuted",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Integer"
+ }
+ ]
+ },
+ {
+ "name": "MemberAdded",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Hash160"
+ }
+ ]
+ },
+ {
+ "name": "ContractPaused",
+ "parameters": []
+ },
+ {
+ "name": "ProposalCreated",
+ "parameters": [
+ {
+ "name": "arg1",
+ "type": "Integer"
+ },
+ {
+ "name": "arg2",
+ "type": "Hash160"
+ },
+ {
+ "name": "arg3",
+ "type": "Integer"
+ },
+ {
+ "name": "arg4",
+ "type": "Integer"
+ }
+ ]
+ },
+ {
+ "name": "ContractUnpaused",
+ "parameters": []
+ }
+ ]
+ },
+ "permissions": [
+ {
+ "contract": "*",
+ "methods": "*"
+ }
+ ],
+ "trusts": [],
+ "extra": {
+ "Email": "info@grantshares.io",
+ "Description": "The governing contract of the GrantShares DAO",
+ "Author": "AxLabs",
+ "Website": "https://grantshares.io"
+ }
+}
diff --git a/src/test/resources/TestGrantSharesBridgeAdapter.manifest.json b/src/test/resources/TestGrantSharesBridgeAdapter.manifest.json
new file mode 100644
index 0000000..3d94aeb
--- /dev/null
+++ b/src/test/resources/TestGrantSharesBridgeAdapter.manifest.json
@@ -0,0 +1,40 @@
+{
+ "name" : "GrantSharesBridgeAdapter",
+ "groups" : [ ],
+ "features" : { },
+ "supportedstandards" : [ ],
+ "abi" : {
+ "methods" : [ {
+ "name" : "putSomething",
+ "parameters" : [ {
+ "name" : "key",
+ "type" : "String"
+ }, {
+ "name" : "value",
+ "type" : "String"
+ } ],
+ "offset" : 0,
+ "returntype" : "Boolean",
+ "safe" : false
+ }, {
+ "name" : "getSomething",
+ "parameters" : [ {
+ "name" : "key",
+ "type" : "String"
+ } ],
+ "offset" : 14,
+ "returntype" : "ByteArray",
+ "safe" : false
+ }, {
+ "name" : "_initialize",
+ "parameters" : [ ],
+ "offset" : 26,
+ "returntype" : "Void",
+ "safe" : false
+ } ],
+ "events" : [ ]
+ },
+ "permissions" : [ ],
+ "trusts" : [ ],
+ "extra" : { }
+}
\ No newline at end of file
diff --git a/src/test/resources/TestGrantSharesBridgeAdapter.nef b/src/test/resources/TestGrantSharesBridgeAdapter.nef
new file mode 100644
index 0000000..6111ec1
Binary files /dev/null and b/src/test/resources/TestGrantSharesBridgeAdapter.nef differ
diff --git a/src/test/resources/TestGrantSharesGov.manifest.json b/src/test/resources/TestGrantSharesGov.manifest.json
index c51052d..d5edb7a 100644
--- a/src/test/resources/TestGrantSharesGov.manifest.json
+++ b/src/test/resources/TestGrantSharesGov.manifest.json
@@ -28,4 +28,4 @@
"name": "GrantSharesGov",
"supportedstandards": [],
"extra": null
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/TestGrantSharesTreasury.manifest.json b/src/test/resources/TestGrantSharesTreasury.manifest.json
index ea76830..d93185e 100644
--- a/src/test/resources/TestGrantSharesTreasury.manifest.json
+++ b/src/test/resources/TestGrantSharesTreasury.manifest.json
@@ -28,4 +28,4 @@
"name": "GrantSharesTreasury",
"supportedstandards": [],
"extra": null
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/default.neo-express b/src/test/resources/default.neo-express
index f92547e..7ae89b5 100644
--- a/src/test/resources/default.neo-express
+++ b/src/test/resources/default.neo-express
@@ -147,4 +147,4 @@
"rpc.BindAddress": "0.0.0.0",
"chain.SecondsPerBlock": "1"
}
-}
\ No newline at end of file
+}
diff --git a/src/test/solidity/GrantSharesRelayer.t.sol b/src/test/solidity/GrantSharesRelayer.t.sol
new file mode 100644
index 0000000..aff210b
--- /dev/null
+++ b/src/test/solidity/GrantSharesRelayer.t.sol
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.28;
+
+import {Upgrades, Options} from "openzeppelin-foundry-upgrades/Upgrades.sol";
+import {GrantSharesRelayer, PausableUpgradeable} from "../../main/solidity/GrantSharesRelayer.sol";
+
+import {Test} from "forge-std/Test.sol";
+
+contract GrantSharesRelayerTest is Test {
+ address relayerProxyAddress;
+ GrantSharesRelayer relayer;
+ address owner = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
+
+ uint256 constant DEFAULT_CREATE_FEE = 1;
+ uint256 constant DEFAULT_EXECUTION_FEE = 2;
+
+ function setUp() public {
+ Options memory opts;
+ opts.unsafeAllow = "constructor";
+
+ relayerProxyAddress = Upgrades.deployUUPSProxy(
+ "GrantSharesRelayer.sol",
+ abi.encodeCall(GrantSharesRelayer.initialize, (owner, DEFAULT_CREATE_FEE, DEFAULT_EXECUTION_FEE)),
+ opts
+ );
+ relayer = GrantSharesRelayer(relayerProxyAddress);
+ }
+
+ function testInitialState() public view {
+ assertEq(relayer.owner(), owner);
+ assert(!relayer.paused());
+ assertEq(relayer.getFees().proposalFee, DEFAULT_CREATE_FEE);
+ assertEq(relayer.getFees().executionFee, DEFAULT_EXECUTION_FEE);
+ }
+
+ function testProposalEvent() public {
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.CreateProposal(address(this), GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ relayer.propose{value: DEFAULT_CREATE_FEE}(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ }
+
+ function testExecutionEvent() public {
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.ExecuteProposal(1);
+ relayer.execute{value: DEFAULT_EXECUTION_FEE}(1);
+ }
+
+ function testProposalFee() public {
+ vm.prank(owner);
+ uint256 newFee = 4;
+
+ // Set new fee
+ vm.expectEmit(true, false, false, true, address(relayer));
+ emit GrantSharesRelayer.ProposalFeeUpdated(newFee);
+ relayer.setProposalFee(newFee);
+ assertEq(relayer.getFees().proposalFee, newFee);
+ assertNotEq(DEFAULT_CREATE_FEE, newFee);
+
+ // Fail without value
+ vm.expectRevert(GrantSharesRelayer.InvalidPaymentAmount.selector);
+ relayer.propose(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+
+ // Fail with wrong value
+ vm.expectRevert(GrantSharesRelayer.InvalidPaymentAmount.selector);
+ relayer.propose{value: DEFAULT_CREATE_FEE}(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.CreateProposal(address(this), GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ relayer.propose{value: newFee}(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ }
+
+ function testExecutionFee() public {
+ uint256 newFee = 5;
+ vm.prank(owner);
+
+ // Set new fee
+ vm.expectEmit(true, false, false, true, address(relayer));
+ emit GrantSharesRelayer.ExecutionFeeUpdated(newFee);
+ relayer.setExecutionFee(newFee);
+ assertEq(relayer.getFees().executionFee, newFee);
+ assertNotEq(DEFAULT_EXECUTION_FEE, newFee);
+
+ // Fail without value
+ vm.expectRevert(GrantSharesRelayer.InvalidPaymentAmount.selector);
+ relayer.execute(1);
+
+ // Fail with wrong value
+ vm.expectRevert(GrantSharesRelayer.InvalidPaymentAmount.selector);
+ relayer.execute{value: DEFAULT_EXECUTION_FEE}(1);
+
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.ExecuteProposal(1);
+ relayer.execute{value: newFee}(1);
+ }
+
+ function testWithdrawal() public {
+ // Pay proposal fee
+ relayer.propose{value: DEFAULT_CREATE_FEE}(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+
+ // Pay execution fee
+ relayer.execute{value: DEFAULT_EXECUTION_FEE}(1);
+
+ // Check initial balance of owner
+ uint256 initialBalance = owner.balance;
+
+ // Withdraw fees
+ vm.prank(owner);
+ relayer.withdrawFees();
+
+ // Check final balance of owner
+ uint256 finalBalance = owner.balance;
+
+ // Assert that the final balance is increased by the sum of the fees
+ assertEq(finalBalance, initialBalance + DEFAULT_CREATE_FEE + DEFAULT_EXECUTION_FEE);
+ }
+
+ function testPause() public {
+ vm.prank(owner);
+ relayer.pause();
+ assert(relayer.paused());
+
+ vm.expectRevert(PausableUpgradeable.EnforcedPause.selector);
+ relayer.propose(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ vm.expectRevert(PausableUpgradeable.EnforcedPause.selector);
+ relayer.execute(1);
+
+ vm.prank(owner);
+ relayer.unpause();
+ assert(!relayer.paused());
+
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.CreateProposal(address(this), GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ relayer.propose{value: DEFAULT_CREATE_FEE}(GrantSharesRelayer.Proposal("intent", "offchainUri", 1));
+ vm.expectEmit(true, true, false, true, address(relayer));
+ emit GrantSharesRelayer.ExecuteProposal(1);
+ relayer.execute{value: DEFAULT_EXECUTION_FEE}(1);
+ }
+}
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000..0f4ebaa
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,13 @@
+{
+ "compilerOptions": {
+ "target": "es2018",
+ "module": "commonjs",
+ "strict": true,
+ "esModuleInterop": true,
+ "outDir": "dist",
+ "declaration": true,
+ "resolveJsonModule": true
+ },
+ "include": ["./tasks", "./src/deploy/typescript", "./typechain-types"],
+ "files": ["./hardhat.config.ts"]
+}