Skip to content

Commit

Permalink
Merge branch 'staging' into mainnet
Browse files Browse the repository at this point in the history
  • Loading branch information
talentlessguy committed Jul 19, 2024
2 parents 7becdfd + 026adb0 commit 05f9bd1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn format && git add .
bun run format && git add .
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,19 +152,19 @@ This repo runs a husky precommit to prettify all contract files to keep them con
```
git clone https://github.com/ensdomains/ens-contracts
cd ens-contracts
yarn
bun i
```

### How to run tests

```
yarn test
bun run test
```

### How to publish

```
yarn pub
bun run pub
```

### Release flow
Expand Down
10 changes: 4 additions & 6 deletions contracts/wrapper/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -442,13 +442,12 @@ RESOLVER_ADDRESS=

### Run deploy script

`yarn deploy:rinkeby` will deploy to rinkeby and verify its source code
`bun run deploy:rinkeby` will deploy to rinkeby and verify its source code

NOTE: If you want to override the default metadata url, set `METADATA_HOST=` to `.env`

```
$yarn deploy:rinkeby
yarn run v1.22.10
$ bun run deploy:rinkeby
$ npx hardhat run --network rinkeby scripts/deploy.js
Deploying contracts to rinkeby with the account:0x97bA55F61345665cF08c4233b9D6E61051A43B18
Account balance: 1934772596667918724 true
Expand All @@ -472,11 +471,10 @@ After running the script it sets addresses to `.env`. If you want to redeploy so

1. Register a name using the account you used to deploy the contract
2. Set the label (`matoken` for `matoken.eth`) to `SEED_NAME=` on `.env`
3. Run `yarn seed:rinkeby`
3. Run `bun run seed:rinkeby`

```
~/.../ens/name-wrapper (seed)$yarn seed:rinkeby
yarn run v1.22.10
~/.../ens/name-wrapper (seed)$ bun run seed:rinkeby
$ npx hardhat run --network rinkeby scripts/seed.js
Account balance: 1925134991223891632
{
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"lint": "hardhat check",
"build": "rm -rf ./build/deploy ./build/hardhat.config.js && hardhat compile && tsc",
"format": "prettier --write .",
"prepublishOnly": "yarn build",
"pub": "yarn publish --access public",
"prepublishOnly": "bun run build",
"pub": "npm publish --access public",
"prepare": "husky install",
"wikiCheck": "bun ./scripts/wikiCheck.ts",
"postinstall": "bunx patch-package"
Expand Down
2 changes: 1 addition & 1 deletion test/ethregistrar/exponentialPremiumScript.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# rerun if logic changes significantly for the ExponentialPremiumPriceOracle
for i in $(seq 0 11); do for j in $(seq 0 4); do OFFSET=$((i+j*12)) yarn test test/ethregistrar/TestExponentialPremiumPriceOracle.js; done & done
for i in $(seq 0 11); do for j in $(seq 0 4); do OFFSET=$((i+j*12)) bun run test test/ethregistrar/TestExponentialPremiumPriceOracle.js; done & done

0 comments on commit 05f9bd1

Please sign in to comment.