fix: moved ethereum files

EKOKE-DAO · Nov 21, 2024 · 90b2cc7 · 90b2cc7
1 parent 669bf85
commit 90b2cc7
Show file tree

Hide file tree

Showing 47 changed files with 611 additions and 336 deletions.
diff --git a/.github/workflows/ethereum.yml b/.github/workflows/ethereum.yml
@@ -13,14 +13,14 @@ jobs:
           node-version: "20.x"
       - run: yarn --ignore-scripts
         shell: bash
-        working-directory: ./ethereum/ekoke
+        working-directory: ./ethereum
       - name: Create local node and deploy
         run: |
           cp .env.github .env &&
           yarn hardhat node &
           sleep 2 &&
           yarn deploy:localhost
-        working-directory: ./ethereum/ekoke
+        working-directory: ./ethereum
       - name: tests
         run: yarn hardhat test
-        working-directory: ./ethereum/ekoke
+        working-directory: ./ethereum
diff --git a/ethereum/ekoke/.env.github → ethereum/.env.github b/ethereum/ekoke/.env.github → ethereum/.env.github
diff --git a/ethereum/ekoke/.gitignore → ethereum/.gitignore b/ethereum/ekoke/.gitignore → ethereum/.gitignore
diff --git a/ethereum/ekoke/LICENSE → ethereum/LICENSE b/ethereum/ekoke/LICENSE → ethereum/LICENSE
diff --git a/ethereum/ekoke/README.md → ethereum/README.md b/ethereum/ekoke/README.md → ethereum/README.md
diff --git a/ethereum/ekoke/app/.eslintignore → ethereum/app/.eslintignore b/ethereum/ekoke/app/.eslintignore → ethereum/app/.eslintignore
diff --git a/ethereum/ekoke/app/.eslintrc.json → ethereum/app/.eslintrc.json b/ethereum/ekoke/app/.eslintrc.json → ethereum/app/.eslintrc.json
diff --git a/ethereum/ekoke/app/.postcssrc → ethereum/app/.postcssrc b/ethereum/ekoke/app/.postcssrc → ethereum/app/.postcssrc
diff --git a/ethereum/ekoke/app/.prettierrc → ethereum/app/.prettierrc b/ethereum/ekoke/app/.prettierrc → ethereum/app/.prettierrc
diff --git a/ethereum/ekoke/app/README.md → ethereum/app/README.md b/ethereum/ekoke/app/README.md → ethereum/app/README.md
diff --git a/ethereum/ekoke/app/package.json → ethereum/app/package.json b/ethereum/ekoke/app/package.json → ethereum/app/package.json
diff --git a/ethereum/ekoke/app/src/App.tsx → ethereum/app/src/App.tsx b/ethereum/ekoke/app/src/App.tsx → ethereum/app/src/App.tsx
diff --git a/ethereum/ekoke/app/src/favicon.ico → ethereum/app/src/favicon.ico b/ethereum/ekoke/app/src/favicon.ico → ethereum/app/src/favicon.ico
diff --git a/ethereum/ekoke/app/src/index.html → ethereum/app/src/index.html b/ethereum/ekoke/app/src/index.html → ethereum/app/src/index.html
diff --git a/ethereum/ekoke/app/src/index.tsx → ethereum/app/src/index.tsx b/ethereum/ekoke/app/src/index.tsx → ethereum/app/src/index.tsx
diff --git a/...ekoke/app/src/js/components/AppLayout.tsx → ethereum/app/src/js/components/AppLayout.tsx b/...ekoke/app/src/js/components/AppLayout.tsx → ethereum/app/src/js/components/AppLayout.tsx
diff --git a/...ke/app/src/js/components/Form/Balance.tsx → ...um/app/src/js/components/Form/Balance.tsx b/...ke/app/src/js/components/Form/Balance.tsx → ...um/app/src/js/components/Form/Balance.tsx
diff --git a/...ents/Form/ChangeOwner/ChangeOwnerForm.tsx → ...ents/Form/ChangeOwner/ChangeOwnerForm.tsx b/...ents/Form/ChangeOwner/ChangeOwnerForm.tsx → ...ents/Form/ChangeOwner/ChangeOwnerForm.tsx
diff --git a/...ekoke/app/src/js/components/Form/Form.tsx → ethereum/app/src/js/components/Form/Form.tsx b/...ekoke/app/src/js/components/Form/Form.tsx → ethereum/app/src/js/components/Form/Form.tsx
diff --git a/...m/MintTestnetTokens/MintTestnetTokens.tsx → ...m/MintTestnetTokens/MintTestnetTokens.tsx b/...m/MintTestnetTokens/MintTestnetTokens.tsx → ...m/MintTestnetTokens/MintTestnetTokens.tsx
diff --git a/...nounceOwnership/RenounceOwnershipForm.tsx → ...nounceOwnership/RenounceOwnershipForm.tsx b/...nounceOwnership/RenounceOwnershipForm.tsx → ...nounceOwnership/RenounceOwnershipForm.tsx
diff --git a/...erAddress/SetEkokeCanisterAddressForm.tsx → ...erAddress/SetEkokeCanisterAddressForm.tsx b/...erAddress/SetEkokeCanisterAddressForm.tsx → ...erAddress/SetEkokeCanisterAddressForm.tsx
diff --git a/.../src/js/components/Form/SwappedSupply.tsx → .../src/js/components/Form/SwappedSupply.tsx b/.../src/js/components/Form/SwappedSupply.tsx → .../src/js/components/Form/SwappedSupply.tsx
diff --git a/...components/Form/Transfer/TransferForm.tsx → ...components/Form/Transfer/TransferForm.tsx b/...components/Form/Transfer/TransferForm.tsx → ...components/Form/Transfer/TransferForm.tsx
diff --git a/...app/src/js/components/MetamaskConnect.tsx → ...app/src/js/components/MetamaskConnect.tsx b/...app/src/js/components/MetamaskConnect.tsx → ...app/src/js/components/MetamaskConnect.tsx
diff --git a/...rc/js/components/MetamaskConnect/Logo.tsx → ...rc/js/components/MetamaskConnect/Logo.tsx b/...rc/js/components/MetamaskConnect/Logo.tsx → ...rc/js/components/MetamaskConnect/Logo.tsx
diff --git a/...app/src/js/components/reusable/Alerts.tsx → ...app/src/js/components/reusable/Alerts.tsx b/...app/src/js/components/reusable/Alerts.tsx → ...app/src/js/components/reusable/Alerts.tsx
diff --git a/...app/src/js/components/reusable/Button.tsx → ...app/src/js/components/reusable/Button.tsx b/...app/src/js/components/reusable/Button.tsx → ...app/src/js/components/reusable/Button.tsx
diff --git a/...e/app/src/js/components/reusable/Card.tsx → ...m/app/src/js/components/reusable/Card.tsx b/...e/app/src/js/components/reusable/Card.tsx → ...m/app/src/js/components/reusable/Card.tsx
diff --git a/.../src/js/components/reusable/Container.tsx → .../src/js/components/reusable/Container.tsx b/.../src/js/components/reusable/Container.tsx → .../src/js/components/reusable/Container.tsx
diff --git a/...pp/src/js/components/reusable/Heading.tsx → ...pp/src/js/components/reusable/Heading.tsx b/...pp/src/js/components/reusable/Heading.tsx → ...pp/src/js/components/reusable/Heading.tsx
diff --git a/.../app/src/js/components/reusable/Input.tsx → .../app/src/js/components/reusable/Input.tsx b/.../app/src/js/components/reusable/Input.tsx → .../app/src/js/components/reusable/Input.tsx
diff --git a/...e/app/src/js/components/reusable/Page.tsx → ...m/app/src/js/components/reusable/Page.tsx b/...e/app/src/js/components/reusable/Page.tsx → ...m/app/src/js/components/reusable/Page.tsx
diff --git a/...app/src/js/components/reusable/Select.tsx → ...app/src/js/components/reusable/Select.tsx b/...app/src/js/components/reusable/Select.tsx → ...app/src/js/components/reusable/Select.tsx
diff --git a/ethereum/ekoke/app/src/js/web3/Web3Client.ts → ethereum/app/src/js/web3/Web3Client.ts b/ethereum/ekoke/app/src/js/web3/Web3Client.ts → ethereum/app/src/js/web3/Web3Client.ts
diff --git a/.../ekoke/app/src/js/web3/contracts/Ekoke.ts → ethereum/app/src/js/web3/contracts/Ekoke.ts b/.../ekoke/app/src/js/web3/contracts/Ekoke.ts → ethereum/app/src/js/web3/contracts/Ekoke.ts
diff --git a/ethereum/ekoke/app/src/styles.css → ethereum/app/src/styles.css b/ethereum/ekoke/app/src/styles.css → ethereum/app/src/styles.css
diff --git a/ethereum/ekoke/app/tailwind.config.js → ethereum/app/tailwind.config.js b/ethereum/ekoke/app/tailwind.config.js → ethereum/app/tailwind.config.js
diff --git a/ethereum/ekoke/app/tsconfig.json → ethereum/app/tsconfig.json b/ethereum/ekoke/app/tsconfig.json → ethereum/app/tsconfig.json
diff --git a/ethereum/ekoke/app/yarn.lock → ethereum/app/yarn.lock b/ethereum/ekoke/app/yarn.lock → ethereum/app/yarn.lock
diff --git a/ethereum/ekoke/contracts/Ekoke.sol → ethereum/contracts/Ekoke.sol b/ethereum/ekoke/contracts/Ekoke.sol → ethereum/contracts/Ekoke.sol
diff --git a/ethereum/ekoke/hardhat.config.ts → ethereum/hardhat.config.ts b/ethereum/ekoke/hardhat.config.ts → ethereum/hardhat.config.ts
diff --git a/ethereum/ekoke/package.json → ethereum/package.json b/ethereum/ekoke/package.json → ethereum/package.json
@@ -17,20 +17,24 @@
     "@ethersproject/providers": "^5.7.2",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.3",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",
+    "@nomicfoundation/hardhat-ignition": "^0.15.7",
+    "@nomicfoundation/hardhat-ignition-ethers": "^0.15.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.10",
-    "@nomicfoundation/hardhat-toolbox": "^4.0.0",
+    "@nomicfoundation/hardhat-toolbox": "^5",
     "@nomicfoundation/hardhat-verify": "^2.0.3",
+    "@nomicfoundation/ignition-core": "^0.15.7",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@typechain/ethers-v5": "^11.1.2",
-    "@typechain/hardhat": "^6.1.2",
-    "@types/chai": "^4.3.11",
+    "@typechain/ethers-v6": "^0.5.0",
+    "@typechain/hardhat": "^9",
+    "@types/chai": "^4",
     "@types/mocha": "^10.0.6",
     "@types/node": "^20.10.8",
-    "chai": "^4.2",
+    "chai": "^4",
     "dotenv": "^16.3.1",
     "ethers": "^6",
     "hardhat": "^2.19.4",
-    "hardhat-gas-reporter": "^1.0.9",
+    "hardhat-gas-reporter": "^2",
     "solidity-coverage": "^0.8.5",
     "ts-node": "^10.9.2",
     "typechain": "^8.3.2",

diff --git a/ethereum/ekoke/scripts/deploy.ts → ethereum/scripts/deploy.ts b/ethereum/ekoke/scripts/deploy.ts → ethereum/scripts/deploy.ts
diff --git a/ethereum/ekoke/test/Ekoke.ts → ethereum/test/Ekoke.ts b/ethereum/ekoke/test/Ekoke.ts → ethereum/test/Ekoke.ts
diff --git a/ethereum/ekoke/tsconfig.json → ethereum/tsconfig.json b/ethereum/ekoke/tsconfig.json → ethereum/tsconfig.json
diff --git a/ethereum/ekoke/yarn.lock → ethereum/yarn.lock b/ethereum/ekoke/yarn.lock → ethereum/yarn.lock