Merge branch 'main' into joaquim/twcontract

Author: jakeloo

contracts/yarn.lock

@@ -1,10 +1,34 @@
 #!/usr/bin/env bash
 
-# Exit script as soon as a command fails.
-set -o errexit
+POSITIONAL_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --local)
+      local=1
+      shift # past argument
+      ;;
+    --no-build)
+      skip_build=1
+      shift # past argument
+      ;;
+    -*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+    *)
+      POSITIONAL_ARGS+=("$1") # save positional arg
+      shift # past argument
+      ;;
+  esac
+done
+
+set -- "${POSITIONAL_ARGS[@]}" # restore positional parameters
 
 echo "### Release script started..."
+if [[ $skip_build -eq 0 ]]; then
 yarn build
+fi
 echo "### Build finished. Copying abis."
 rm -rf contracts/abi
 mkdir -p contracts/abi
@@ -18,7 +42,11 @@ cp README.md contracts/README.md
 # publish from contracts folder
 cd contracts
 echo "### Publishing..."
+if [[ $local -eq 1 ]]; then
+yalc push
+else
 np --any-branch --no-tests
+fi
 # delete copied README
 rm README.md
 # back to root folder

release.sh

@@ -3,12 +3,17 @@ import hre, { ethers } from "hardhat";
 import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { TWFactory, Marketplace } from "typechain";
 
+import { nativeTokenWrapper } from "../../utils/nativeTokenWrapper";
+
 async function main() {
+
+  const chainId: number = hre.network.config.chainId as number;
+
   const [caller]: SignerWithAddress[] = await ethers.getSigners();
 
-  const nativeTokenWrapperAddress: string = ethers.constants.AddressZero; // replace
+  const nativeTokenWrapperAddress: string = nativeTokenWrapper[chainId];
   const twFeeAddress: string = ethers.constants.AddressZero; // replace
-  const twFactoryAddress: string = ethers.constants.AddressZero; // replace
+  const twFactoryAddress: string = ethers.constants.AddressZero; // replace Fantom: 0x97EA0Fcc552D5A8Fb5e9101316AAd0D62Ea0876B rest: 0x5DBC7B840baa9daBcBe9D2492E45D7244B54A2A0
 
   const twFactory: TWFactory = await ethers.getContractAt("TWFactory", twFactoryAddress);
 
@@ -21,7 +26,7 @@ async function main() {
   }
   const marketplace: Marketplace = await ethers
     .getContractFactory("Marketplace")
-    .then(f => f.deploy(nativeTokenWrapperAddress, twFeeAddress));
+    .then(f => f.deploy(nativeTokenWrapperAddress, twFeeAddress, { gasPrice: ethers.utils.parseUnits("300", "gwei") }));
 
   console.log(
     "Deploying Marketplace \ntransaction: ",
@@ -30,6 +35,8 @@ async function main() {
     marketplace.address,
   );
 
+  await marketplace.deployed();
+
   console.log("\n");
 
   const addImplementationTx = await twFactory.addImplementation(marketplace.address);

scripts/deploy/marketplace.ts

@@ -0,0 +1,11 @@
+export const nativeTokenWrapper: Record<number, string> = {
+    1: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    4: "0xc778417E063141139Fce010982780140Aa0cD5Ab", // rinkeby
+    5: "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6", // goerli
+    137: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
+    80001: "0x9c3C9283D3e44854697Cd22D3Faa240Cfb032889",
+    43114: "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
+    43113: "0xd00ae08403B9bbb9124bB305C09058E32C39A48c",
+    250: "0x21be370D5312f44cB42ce377BC9b8a0cEF1A4C83",
+    4002: "0xf1277d1Ed8AD466beddF92ef448A132661956621",
+};