filecoin

avcdsld · Jun 2, 2024 · 476a64d · 476a64d
1 parent 989fa36
commit 476a64d
Show file tree

Hide file tree

Showing 23 changed files with 2,080 additions and 104 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,7 @@
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
+    "source.fixAll.eslint": "explicit"
   },
   "solidity.packageDefaultDependenciesContractsDirectory": "",
   "solidity.packageDefaultDependenciesDirectory": "node_modules"

diff --git a/packages/contracts/evm-compatible/README.txt b/packages/contracts/evm-compatible/README.txt
@@ -0,0 +1,4 @@
+```sh
+direnv allow
+npx hardhat deploy --network [network]
+```
diff --git a/packages/contracts/evm-compatible/contracts/SakutaroPoem.sol b/packages/contracts/evm-compatible/contracts/SakutaroPoem.sol
@@ -54,7 +54,7 @@ contract SakutaroPoem is ERC721 {
     }
 
     function tokenURI(uint256 tokenId) public view override(ERC721) returns (string memory) {
-        uint256 id = (uint160(ownerOf[tokenId]) + seed) % uint256(39);
+        uint256 id = (uint160(ownerOf(tokenId)) + seed) % uint256(39);
         return ITokenURI(tokenURIContractAddress).tokenURI(id);
     }
 
@@ -68,7 +68,7 @@ contract SakutaroPoem is ERC721 {
 
     // ERC-2981
     function royaltyInfo(
-        uint256, /* _tokenId */
+        uint256 /* _tokenId */,
         uint256 _value
     ) external view returns (address _receiver, uint256 _royaltyAmount) {
         _receiver = royaltyReceiver;

diff --git a/packages/contracts/evm-compatible/deploy/00_SakutaroPoem.ts b/packages/contracts/evm-compatible/deploy/00_SakutaroPoem.ts
@@ -2,14 +2,21 @@ const func = async (hre: any) => {
   const { deployments, getNamedAccounts } = hre;
   const { deploy } = deployments;
   const { deployer } = await getNamedAccounts();
+  const feeData = await hre.ethers.provider.getFeeData();
   const tokenURIContract = await deploy("TokenURI", {
     from: deployer,
     log: true,
+    maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
+    maxFeePerGas: feeData.maxFeePerGas,
+    type: "0x2",
   });
   await deploy("SakutaroPoem", {
     from: deployer,
     args: [tokenURIContract.address],
     log: true,
+    maxPriorityFeePerGas: feeData.maxPriorityFeePerGas,
+    maxFeePerGas: feeData.maxFeePerGas,
+    type: "0x2",
   });
 };
 

diff --git a/packages/contracts/evm-compatible/deployments/filecoin/.chainId b/packages/contracts/evm-compatible/deployments/filecoin/.chainId
@@ -0,0 +1 @@
+314