PundiAI · fx0x55 · Oct 18, 2024 · Oct 18, 2024
diff --git a/contract/IRefundCallback.go b/contract/IRefundCallback.go
diff --git a/contract/compile.sh b/contract/compile.sh
@@ -30,34 +30,24 @@ echo "===> Compiling contracts"
 
 [[ ! -d "$project_dir/contract/artifacts" ]] && mkdir -p "$project_dir/contract/artifacts"
 
-# add core contracts
-contracts=(WFXUpgradable FIP20Upgradable ICrosschain IStaking IFxBridgeLogic IBridgeCallback IError IBridgeFeeQuote)
-contracts_test=(CrosschainTest StakingTest)
-# add 3rd party contracts
-contracts+=(ERC1967Proxy)
-contracts_test+=(ERC721TokenTest)
+contracts=(WFXUpgradable FIP20Upgradable IStaking IError ERC1967Proxy)
+contracts+=(IFxBridgeLogic IBridgeCallback IBridgeFeeQuote ICrosschain)
+contracts+=(CrosschainTest StakingTest ERC721TokenTest)
 
 for contract in "${contracts[@]}"; do
   echo "===> Ethereum ABI wrapper code generator: $contract"
   file_path=$(find "$project_dir/solidity/artifacts" -name "${contract}.json" -type f)
   jq -c '.abi' "$file_path" >"$project_dir/contract/artifacts/${contract}.abi"
   jq -r '.bytecode' "$file_path" >"$project_dir/contract/artifacts/${contract}.bin"
+  go_filename=$(echo "${contract}" | sed -r 's/([a-z])([A-Z])/\1_\2/g' | tr '[:upper:]' '[:lower:]')
+  out="contract/${go_filename}.sol.go"
+  if [[ $contract =~ Test$ ]]; then
+    out="tests/contract/${go_filename}.sol.go"
+  fi
   abigen --abi "$project_dir/contract/artifacts/${contract}.abi" \
     --bin "$project_dir/contract/artifacts/${contract}.bin" \
     --type "${contract}" --pkg contract \
-    --out "$project_dir/contract/${contract}.go"
-done
-
-# test contracts
-for contract_test in "${contracts_test[@]}"; do
-  echo "===> Ethereum ABI wrapper code generator: $contract_test"
-  file_path=$(find "$project_dir/solidity/artifacts" -name "${contract_test}.json" -type f)
-  jq -c '.abi' "$file_path" >"$project_dir/contract/artifacts/${contract_test}.abi"
-  jq -r '.bytecode' "$file_path" >"$project_dir/contract/artifacts/${contract_test}.bin"
-  abigen --abi "$project_dir/contract/artifacts/${contract_test}.abi" \
-    --bin "$project_dir/contract/artifacts/${contract_test}.bin" \
-    --type "${contract_test}" --pkg contract \
-    --out "$project_dir/tests/contract/${contract_test}.go"
+    --out "$project_dir/$out"
 done
 
 rm -rf "$project_dir/contract/artifacts"
diff --git a/contract/ERC1967Proxy.go → contract/erc1967proxy.sol.go b/contract/ERC1967Proxy.go → contract/erc1967proxy.sol.go
diff --git a/contract/FIP20Upgradable.go → contract/fip20upgradable.sol.go b/contract/FIP20Upgradable.go → contract/fip20upgradable.sol.go
diff --git a/contract/IBridgeCallback.go → contract/ibridge_callback.sol.go b/contract/IBridgeCallback.go → contract/ibridge_callback.sol.go
diff --git a/contract/IBridgeFeeQuote.go → contract/ibridge_fee_quote.sol.go b/contract/IBridgeFeeQuote.go → contract/ibridge_fee_quote.sol.go
diff --git a/contract/ICrosschain.go → contract/icrosschain.sol.go b/contract/ICrosschain.go → contract/icrosschain.sol.go
diff --git a/contract/IError.go → contract/ierror.sol.go b/contract/IError.go → contract/ierror.sol.go
diff --git a/contract/IFxBridgeLogic.go → contract/ifx_bridge_logic.sol.go b/contract/IFxBridgeLogic.go → contract/ifx_bridge_logic.sol.go
diff --git a/contract/IStaking.go → contract/istaking.sol.go b/contract/IStaking.go → contract/istaking.sol.go
diff --git a/contract/WFXUpgradable.go → contract/wfxupgradable.sol.go b/contract/WFXUpgradable.go → contract/wfxupgradable.sol.go
diff --git a/tests/contract/CrosschainTest.go → tests/contract/crosschain_test.sol.go b/tests/contract/CrosschainTest.go → tests/contract/crosschain_test.sol.go
diff --git a/tests/contract/ERC721TokenTest.go → tests/contract/erc721token_test.sol.go b/tests/contract/ERC721TokenTest.go → tests/contract/erc721token_test.sol.go
diff --git a/tests/contract/StakingTest.go → tests/contract/staking_test.sol.go b/tests/contract/StakingTest.go → tests/contract/staking_test.sol.go