update

yu2333-design · Jun 3, 2023 · 9e75a5a · 9e75a5a
1 parent 6a684af
commit 9e75a5a
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 3 deletions.
diff --git a/darc-protocol/contracts/DARC.sol → darc-protocol/contracts/protocol/DARC.sol b/darc-protocol/contracts/DARC.sol → darc-protocol/contracts/protocol/DARC.sol
diff --git a/...rotocol/contracts/Dashboard/Dashboard.sol → ...ontracts/protocol/Dashboard/Dashboard.sol b/...rotocol/contracts/Dashboard/Dashboard.sol → ...ontracts/protocol/Dashboard/Dashboard.sol
diff --git a/darc-protocol/contracts/MachineState.sol → ...tocol/contracts/protocol/MachineState.sol b/darc-protocol/contracts/MachineState.sol → ...tocol/contracts/protocol/MachineState.sol
diff --git a/...rotocol/contracts/MachineStateManager.sol → ...ontracts/protocol/MachineStateManager.sol b/...rotocol/contracts/MachineStateManager.sol → ...ontracts/protocol/MachineStateManager.sol
diff --git a/darc-protocol/contracts/Opcodes.sol → darc-protocol/contracts/protocol/Opcodes.sol b/darc-protocol/contracts/Opcodes.sol → darc-protocol/contracts/protocol/Opcodes.sol
diff --git a/...cts/Plugin/ConditionExpressionFactory.sol → ...col/Plugin/ConditionExpressionFactory.sol b/...cts/Plugin/ConditionExpressionFactory.sol → ...col/Plugin/ConditionExpressionFactory.sol
diff --git a/...itions/MachineStateExpressionFunction.sol → ...itions/MachineStateExpressionFunction.sol b/...itions/MachineStateExpressionFunction.sol → ...itions/MachineStateExpressionFunction.sol
diff --git a/...ditions/MintTokensExpressionFunction.sol_ → ...ditions/MintTokensExpressionFunction.sol_ b/...ditions/MintTokensExpressionFunction.sol_ → ...ditions/MintTokensExpressionFunction.sol_
diff --git a/...Conditions/OperatorExpressionFunction.sol → ...Conditions/OperatorExpressionFunction.sol b/...Conditions/OperatorExpressionFunction.sol → ...Conditions/OperatorExpressionFunction.sol
diff --git a/...ons/TransferTokensExpressionFunction.sol_ → ...ons/TransferTokensExpressionFunction.sol_ b/...ons/TransferTokensExpressionFunction.sol_ → ...ons/TransferTokensExpressionFunction.sol_
diff --git a/...tracts/Plugin/EnumConditionExpression.sol → ...otocol/Plugin/EnumConditionExpression.sol b/...tracts/Plugin/EnumConditionExpression.sol → ...otocol/Plugin/EnumConditionExpression.sol
diff --git a/darc-protocol/contracts/Plugin/Plugin.sol → ...ocol/contracts/protocol/Plugin/Plugin.sol b/darc-protocol/contracts/Plugin/Plugin.sol → ...ocol/contracts/protocol/Plugin/Plugin.sol
diff --git a/...otocol/contracts/Plugin/PluginFactory.sol → ...ntracts/protocol/Plugin/PluginFactory.sol b/...otocol/contracts/Plugin/PluginFactory.sol → ...ntracts/protocol/Plugin/PluginFactory.sol
diff --git a/...rotocol/contracts/Plugin/PluginSystem.sol → ...ontracts/protocol/Plugin/PluginSystem.sol b/...rotocol/contracts/Plugin/PluginSystem.sol → ...ontracts/protocol/Plugin/PluginSystem.sol
diff --git a/darc-protocol/contracts/Program.sol → darc-protocol/contracts/protocol/Program.sol b/darc-protocol/contracts/Program.sol → darc-protocol/contracts/protocol/Program.sol
diff --git a/...ntracts/Runtime/Executable/Executable.sol → ...rotocol/Runtime/Executable/Executable.sol b/...ntracts/Runtime/Executable/Executable.sol → ...rotocol/Runtime/Executable/Executable.sol
diff --git a/...Runtime/Executable/InstructionMachine.sol → ...Runtime/Executable/InstructionMachine.sol b/...Runtime/Executable/InstructionMachine.sol → ...Runtime/Executable/InstructionMachine.sol
diff --git a/...e/Instructions/MembershipInstructions.sol → ...e/Instructions/MembershipInstructions.sol b/...e/Instructions/MembershipInstructions.sol → ...e/Instructions/MembershipInstructions.sol
diff --git a/...utable/Instructions/MoneyInstructions.sol → ...utable/Instructions/MoneyInstructions.sol b/...utable/Instructions/MoneyInstructions.sol → ...utable/Instructions/MoneyInstructions.sol
diff --git a/...structions/OfferDividendsInstructions.sol → ...structions/OfferDividendsInstructions.sol b/...structions/OfferDividendsInstructions.sol → ...structions/OfferDividendsInstructions.sol
diff --git a/...le/Instructions/ParameterInstructions.sol → ...le/Instructions/ParameterInstructions.sol b/...le/Instructions/ParameterInstructions.sol → ...le/Instructions/ParameterInstructions.sol
diff --git a/...table/Instructions/PluginInstructions.sol → ...table/Instructions/PluginInstructions.sol b/...table/Instructions/PluginInstructions.sol → ...table/Instructions/PluginInstructions.sol
diff --git a/...utable/Instructions/TokenInstructions.sol → ...utable/Instructions/TokenInstructions.sol b/...utable/Instructions/TokenInstructions.sol → ...utable/Instructions/TokenInstructions.sol
diff --git a/...able/Instructions/UtilityInstructions.sol → ...able/Instructions/UtilityInstructions.sol b/...able/Instructions/UtilityInstructions.sol → ...able/Instructions/UtilityInstructions.sol
diff --git a/...cts/Runtime/PaymentCheck/PaymentCheck.sol → ...col/Runtime/PaymentCheck/PaymentCheck.sol b/...cts/Runtime/PaymentCheck/PaymentCheck.sol → ...col/Runtime/PaymentCheck/PaymentCheck.sol
diff --git a/...ime/ProgramValidator/ProgramValidator.sol → ...ime/ProgramValidator/ProgramValidator.sol b/...ime/ProgramValidator/ProgramValidator.sol → ...ime/ProgramValidator/ProgramValidator.sol
diff --git a/darc-protocol/contracts/Runtime/Runtime.sol → ...ol/contracts/protocol/Runtime/Runtime.sol b/darc-protocol/contracts/Runtime/Runtime.sol → ...ol/contracts/protocol/Runtime/Runtime.sol
diff --git a/...s/Runtime/VotingMachine/VotingMachine.sol → ...l/Runtime/VotingMachine/VotingMachine.sol b/...s/Runtime/VotingMachine/VotingMachine.sol → ...l/Runtime/VotingMachine/VotingMachine.sol
diff --git a/...tocol/contracts/TokenOwnerListManager.sol → ...tracts/protocol/TokenOwnerListManager.sol b/...tocol/contracts/TokenOwnerListManager.sol → ...tracts/protocol/TokenOwnerListManager.sol
diff --git a/...protocol/contracts/Utilities/ErrorMsg.sol → ...contracts/protocol/Utilities/ErrorMsg.sol b/...protocol/contracts/Utilities/ErrorMsg.sol → ...contracts/protocol/Utilities/ErrorMsg.sol
diff --git a/...tocol/contracts/Utilities/FindInArray.sol → ...tracts/protocol/Utilities/FindInArray.sol b/...tocol/contracts/Utilities/FindInArray.sol → ...tracts/protocol/Utilities/FindInArray.sol
diff --git a/...rotocol/contracts/Utilities/OpcodeMap.sol → ...ontracts/protocol/Utilities/OpcodeMap.sol b/...rotocol/contracts/Utilities/OpcodeMap.sol → ...ontracts/protocol/Utilities/OpcodeMap.sol
diff --git a/...tocol/contracts/Utilities/StringUtils.sol → ...tracts/protocol/Utilities/StringUtils.sol b/...tocol/contracts/Utilities/StringUtils.sol → ...tracts/protocol/Utilities/StringUtils.sol
diff --git a/darc-protocol/contracts/VirtualMachine.sol → ...col/contracts/protocol/VirtualMachine.sol b/darc-protocol/contracts/VirtualMachine.sol → ...col/contracts/protocol/VirtualMachine.sol
diff --git a/darc-protocol/contracts/test-contracts/test-voting/VotingTest.sol b/darc-protocol/contracts/test-contracts/test-voting/VotingTest.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity ^0.8.9;
-import "../../Runtime/VotingMachine/VotingMachine.sol";
+import '../../protocol/Runtime/VotingMachine/VotingMachine.sol';
 
 
 /**
@@ -10,5 +10,7 @@ import "../../Runtime/VotingMachine/VotingMachine.sol";
  */
 
 contract VotingTestContract is VotingMachine{
-
+  function initializeVotingTest() public {
+    this.initialize();
+  }
 } 
diff --git a/darc-protocol/test/ABITest/ABITest.ts b/darc-protocol/test/ABITest/ABITest.ts
@@ -5,7 +5,7 @@ import { ethers } from "hardhat";
 import { BigNumber } from "ethers";
 import { deployDARC } from "../../scripts/deployDARC";
 
-import * as darcjson from "../../../darc-protocol/artifacts/contracts/Darc.sol/Darc.json";
+import * as darcjson from "../../../darc-protocol/artifacts/contracts/protocol/Darc.sol/Darc.json";
 
 // test for batch mint token instruction on DARC
 // transfer tokens to another 2 addresses