Skip to content

Commit

Permalink
Merge branch 'main' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
jnsdls authored Feb 16, 2024
2 parents b693937 + 73a374a commit a377669
Show file tree
Hide file tree
Showing 14 changed files with 88 additions and 25 deletions.
5 changes: 5 additions & 0 deletions .changeset/soft-cougars-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@thirdweb-dev/wallets": patch
---

Ignore Rabby wallet extension in MetaMask injected provider detection
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"packageManager": "pnpm@8.9.0",
"dependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.26.2",
"@changesets/get-dependents-graph": "^1.3.6",
"@changesets/get-release-plan": "^3.0.17",
Expand Down
5 changes: 4 additions & 1 deletion packages/chains/chains/1337802.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {
"https://kiln-faucet.pk910.de",
"https://kilnfaucet.com"
],
"features": [],
"icon": {
"url": "ipfs://QmdwQDr6vmBtXmK2TmknkEuZNoaDqTasFdZdu3DRw8b2wt",
"width": 1000,
Expand All @@ -34,12 +35,14 @@ export default {
"decimals": 18
},
"networkId": 1337802,
"redFlags": [],
"rpc": [
"https://kiln.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://1337802.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://rpc.kiln.themerge.dev"
],
"shortName": "kiln",
"slug": "kiln",
"testnet": true
"status": "deprecated",
"testnet": false
} as const satisfies Chain;
3 changes: 3 additions & 0 deletions packages/chains/chains/28.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default {
}
],
"faucets": [],
"features": [],
"infoURL": "https://boba.network",
"name": "Boba Network Rinkeby Testnet",
"nativeCurrency": {
Expand All @@ -27,6 +28,7 @@ export default {
}
]
},
"redFlags": [],
"rpc": [
"https://boba-network-rinkeby-testnet.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://28.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
Expand All @@ -35,5 +37,6 @@ export default {
"shortName": "BobaRinkeby",
"slip44": 1,
"slug": "boba-network-rinkeby-testnet",
"status": "deprecated",
"testnet": true
} as const satisfies Chain;
5 changes: 4 additions & 1 deletion packages/chains/chains/3.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default {
"http://fauceth.komputing.org?chain=3&address=${ADDRESS}",
"https://faucet.ropsten.be?${ADDRESS}"
],
"features": [],
"infoURL": "https://github.com/ethereum/ropsten",
"name": "Ropsten",
"nativeCurrency": {
Expand All @@ -24,6 +25,7 @@ export default {
"decimals": 18
},
"networkId": 3,
"redFlags": [],
"rpc": [
"https://ropsten.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://3.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
Expand All @@ -33,6 +35,7 @@ export default {
"shortName": "rop",
"slip44": 1,
"slug": "ropsten",
"testnet": true,
"status": "deprecated",
"testnet": false,
"title": "Ethereum Testnet Ropsten"
} as const satisfies Chain;
3 changes: 3 additions & 0 deletions packages/chains/chains/4.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default {
"http://fauceth.komputing.org?chain=4&address=${ADDRESS}",
"https://faucet.rinkeby.io"
],
"features": [],
"infoURL": "https://www.rinkeby.io",
"name": "Rinkeby",
"nativeCurrency": {
Expand All @@ -24,6 +25,7 @@ export default {
"decimals": 18
},
"networkId": 4,
"redFlags": [],
"rpc": [
"https://rinkeby.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://4.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
Expand All @@ -33,6 +35,7 @@ export default {
"shortName": "rin",
"slip44": 1,
"slug": "rinkeby",
"status": "deprecated",
"testnet": true,
"title": "Ethereum Testnet Rinkeby"
} as const satisfies Chain;
3 changes: 3 additions & 0 deletions packages/chains/chains/421611.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default {
"faucets": [
"http://fauceth.komputing.org?chain=421611&address=${ADDRESS}"
],
"features": [],
"infoURL": "https://arbitrum.io",
"name": "Arbitrum Rinkeby",
"nativeCurrency": {
Expand All @@ -34,6 +35,7 @@ export default {
}
]
},
"redFlags": [],
"rpc": [
"https://arbitrum-rinkeby.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://421611.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
Expand All @@ -42,6 +44,7 @@ export default {
"shortName": "arb-rinkeby",
"slip44": 1,
"slug": "arbitrum-rinkeby",
"status": "deprecated",
"testnet": true,
"title": "Arbitrum Testnet Rinkeby"
} as const satisfies Chain;
31 changes: 31 additions & 0 deletions packages/chains/chains/64273.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import type { Chain } from "../src/types";
export default {
"chain": "Avalanche",
"chainId": 64273,
"explorers": [],
"faucets": [],
"features": [],
"icon": {
"url": "https://images.ctfassets.net/9bazykntljf6/62CceHSYsRS4D9fgDSkLRB/877cb8f26954e1743ff535fd7fdaf78f/avacloud-placeholder.svg",
"width": 256,
"height": 256,
"format": "svg"
},
"infoURL": "https://avacloud.io",
"name": "REALLY",
"nativeCurrency": {
"name": "REALLY Token",
"symbol": "FAN",
"decimals": 18
},
"networkId": 64273,
"redFlags": [],
"rpc": [
"https://really-really.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://64273.rpc.thirdweb.com/${THIRDWEB_API_KEY}",
"https://subnets.avax.network/really/mainnet/rpc"
],
"shortName": "REALLY",
"slug": "really-really",
"testnet": false
} as const satisfies Chain;
6 changes: 5 additions & 1 deletion packages/chains/src/index.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"update-notifier": "^6.0.2",
"validate-npm-package-name": "^4.0.0",
"xdg-app-paths": "^8.3.0",
"yaml": "^2.3.1"
"yaml": "^2.3.4"
},
"bin": {
"thirdweb": "./dist/cli/index.js"
Expand Down
2 changes: 1 addition & 1 deletion packages/crypto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"@preconstruct/cli": "2.7.0",
"@thirdweb-dev/tsconfig": "workspace:*",
"@types/crypto-js": "^4.1.3",
"@types/crypto-js": "^4.2.2",
"crypto-js": "^4.2.0",
"eslint-config-thirdweb": "workspace:*",
"ethers": "^5.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"tiny-invariant": "^1.2.0",
"tweetnacl": "^1.0.3",
"uuid": "^9.0.1",
"yaml": "^2.3.1",
"yaml": "^2.3.4",
"zod": "^3.22.3"
},
"bugs": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ export function getInjectedMetamaskProvider(): Ethereum | undefined {
return;
}

if (ethereum.isRabbyWallet) {
return;
}

return ethereum;
}

Expand Down
40 changes: 22 additions & 18 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a377669

Please sign in to comment.