Skip to content

Commit 9030802

Browse files
blueccobluecco
authored
Merge pull request #219 from argentlabs/update/starknetjs
refactor: update starknetjs
2 parents 00bc4af + ed9d716 commit 9030802

File tree

7 files changed

+6830
-4110
lines changed

7 files changed

+6830
-4110
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"@cartridge/controller": "^0.7.13",
100100
"@starknet-io/get-starknet": "^4.0.6",
101101
"@starknet-io/get-starknet-core": "^4.0.6",
102-
"@starknet-io/types-js": "^0.7.10",
102+
"@starknet-io/types-js": "0.8.4",
103103
"@trpc/client": "^10.38.1",
104104
"@trpc/server": "^10.38.1",
105105
"@walletconnect/sign-client": "^2.11.0",
@@ -144,7 +144,7 @@
144144
"prettier": "^3.0.3",
145145
"prettier-plugin-import-sort": "^0.0.7",
146146
"semantic-release": "^24.0.0",
147-
"starknet": "^6.24.1",
147+
"starknet": "7.5.1",
148148
"svelte": "^4.0.0",
149149
"svelte-check": "^3.5.1",
150150
"svelte-eslint-parser": "^0.41.1",
@@ -159,7 +159,7 @@
159159
"zod": "^3.20.6"
160160
},
161161
"peerDependencies": {
162-
"starknet": "^6.24.1"
162+
"starknet": "7.5.1"
163163
},
164164
"gitHead": "b16688a8638cc138938e74e1a39d004760165d75"
165165
}

‎pnpm-lock.yaml‎

Lines changed: 6727 additions & 4050 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/connectors/argent/argentMobile/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ export class ArgentMobileBaseConnector extends Connector {
140140
params: { silent_mode: true },
141141
})
142142

143-
return new WalletAccount(provider, this._wallet, undefined, accounts[0])
143+
return new WalletAccount(provider, this._wallet, accounts[0], undefined)
144144
}
145145

146146
async chainId(): Promise<bigint> {

‎src/connectors/controller/constants.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { constants } from "starknet";
1+
import { constants } from "starknet"
22

33
export const CONTROLLER_ICON =
4-
"data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAwIiBoZWlnaHQ9IjgwMCIgdmlld0JveD0iMCAwIDgwMCA4MDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2RfNTExMl83ODIpIj4KPHBhdGggZD0iTTQ2OS4yMzYgNzBDNDgyLjM5IDcwIDQ5My4wNTMgODAuNjYzIDQ5My4wNTMgOTMuODE2NFYxNDcuMTQ3TDUxNS4zMzggMTQ3LjE0N0w1MTUuNDI4IDE0Ny4xNDdMNTE1LjU1NCAxNDcuMTQ3TDUxNS44MjYgMTQ3LjE0OUM1MTYuMDE2IDE0Ny4xNTEgNTE2LjIyNSAxNDcuMTUzIDUxNi40NTEgMTQ3LjE1N0M1MTYuOTA0IDE0Ny4xNjQgNTE3LjQyOCAxNDcuMTc2IDUxOC4wMiAxNDcuMTk1QzUxOS4yMDEgMTQ3LjIzNCA1MjAuNjYgMTQ3LjMwNCA1MjIuMzYxIDE0Ny40MjRDNTI1Ljc0MSAxNDcuNjYzIDUzMC4xODUgMTQ4LjExNCA1MzUuMzYzIDE0OC45NjlDNTQ1LjAwMSAxNTAuNTYyIDU1OC41NTYgMTUzLjc4IDU3Mi45MTggMTYwLjYwM0w3MzAuNDIgMjI2LjY3MUw3MzIuMTAxIDIyNy41MDVDNzcxLjc4NyAyNDcuMTc3IDc4OS45OTMgMjg2LjI5NiA3ODkuOTkzIDMyMi4wMzZWNTg1Ljg2NUM3ODkuOTkzIDU4Ni4wNTQgNzg5Ljk5NCA1ODYuMjU0IDc4OS45OTQgNTg2LjQ2M0w3ODkuOTk2IDU4Ni45MTNDNzkwLjAzOCA1OTcuMDk2IDc5MC4xNjEgNjI2Ljk5NiA3NjQuMjMxIDY1Mi44MjNMNzE0Ljc2IDcwMi4wOTVMNzE0LjY0MSA3MDIuMjE1QzcwNC42MDEgNzEyLjI3NSA2OTIuMTIzIDcyMC42NTIgNjc2LjI4NCA3MjQuODc5QzY2NC4zOSA3MjguMDU0IDY1Mi44MjcgNzI3Ljk2NiA2NDguNjM3IDcyNy45MzRMNjQ4LjYxOSA3MjcuOTMzQzY0OC40MDkgNzI3LjkzMiA2NDguMjE5IDcyNy45MyA2NDguMDQ3IDcyNy45M0w2NDcuNzUyIDcyNy45MjlINDgwLjcyMUM0NzQuMDk0IDcyNy45MjkgNDY4LjcyMSA3MjIuNTU2IDQ2OC43MjEgNzE1LjkyOVY2NjguMzg4SDMyOC41ODZDMzI4LjU4NiA2NzIuNjI5IDMyOC41NzIgNjk4LjA1MiAzMjguNTYxIDcxNS45NDRDMzI4LjU1NyA3MjIuNTY5IDMyMy4xODYgNzI3LjkyOSAzMTYuNTYxIDcyNy45MjlIMTUyLjI0NkMxNTIuMTA0IDcyNy45MjkgMTUxLjk0MiA3MjcuOTI5IDE1MS43NjIgNzI3LjkzMUwxNTEuMzYyIDcyNy45MzRDMTQ3LjE3MiA3MjcuOTY2IDEzNS42MDkgNzI4LjA1NCAxMjMuNzE0IDcyNC44NzlDMTA3Ljg3MyA3MjAuNjUxIDk1LjM5MzggNzEyLjI3MiA4NS4zNTI5IDcwMi4yMUw4NS4yMzg2IDcwMi4wOTVMMzUuNjcgNjUyLjcyNUwzNS41NzIzIDY1Mi42MjdDOS44NjI0MiA2MjYuNzggOS45NjY3IDU5Ny4xODUgMTAuMDAzIDU4Ni44NzRDMTAuMDA0MyA1ODYuNTEzIDEwLjAwNTUgNTg2LjE3NyAxMC4wMDU1IDU4NS44NjVWMzIyLjAzNkMxMC4wMDU1IDI4Ni40MyAyOC4xNjYyIDI0Ny4xOTkgNjcuODk3NyAyMjcuNTA1TDY5LjU3OSAyMjYuNjcxTDIyNy4wODEgMTYwLjYwM0MyNDEuNDQzIDE1My43OCAyNTQuOTk4IDE1MC41NjIgMjY0LjYzNiAxNDguOTY5QzI2OS44MTQgMTQ4LjExNCAyNzQuMjU4IDE0Ny42NjMgMjc3LjYzOCAxNDcuNDI0QzI3OS4zMzggMTQ3LjMwNCAyODAuNzk4IDE0Ny4yMzQgMjgxLjk3OSAxNDcuMTk1QzI4Mi41NzEgMTQ3LjE3NiAyODMuMDk1IDE0Ny4xNjQgMjgzLjU0NyAxNDcuMTU3TDI4My45MTcgMTQ3LjE1MkwyODQuMTczIDE0Ny4xNDlMMjg0LjQ0NSAxNDcuMTQ3TDI4NC41NzEgMTQ3LjE0N0wyODQuNjYgMTQ3LjE0N0wzMDYuOTQyIDE0Ny4xNDdWOTMuODE2NEMzMDYuOTQyIDgwLjY2MyAzMTcuNjA1IDcwIDMzMC43NTggNzBINDY5LjIzNloiIGZpbGw9IiMxOTFBMUEiLz4KPHBhdGggZD0iTTM2Ni40ODMgMTI5LjU0SDQzMy41MTJWMjA2LjY4N0gzNjYuNDgzVjEyOS41NFoiIGZpbGw9IiNGQkNCNEEiLz4KPHBhdGggZD0iTTI2OS4wMSA2MDIuNDI5SDE0NC4wMDhDMTM1Ljc2OCA2MDIuNDI5IDEzNS43NjggNTk0LjE0NiAxMzUuNzY4IDU5NC4xNDZWMjgwLjg1QzEzNS43NjggMjgwLjg1IDEzNS43NjggMjcyLjY0NCAxNDQuMDA4IDI3Mi42NDRIMzY2LjQ4M0wzNjYuNDgzIDIwNi42ODdIMjg0LjY5QzI4NC42OSAyMDYuNjg3IDI2OC4xMzQgMjA2LjY4NyAyNTEuNTc5IDIxNC44OTNMOTQuMzQxNCAyODAuODVDNzcuNzg2MSAyODkuMDU3IDY5LjU0NjkgMzA1LjYyMyA2OS41NDY5IDMyMi4wMzVWNTg1Ljg2M0M2OS41NDY5IDU5NC4xNDcgNjkuNTQ2OSA2MDIuMzUzIDc3Ljc4NjEgNjEwLjYzNkwxMjcuNDUyIDY2MC4xMDRDMTM1LjY5MSA2NjguMzg3IDE0MS45MjggNjY4LjM4NyAxNTIuMjQ3IDY2OC4zODdIMjY5LjAyOUMyNjkuMDM3IDY0OC4zNCAyNjkuMDQ2IDYyNC42NTUgMjY5LjA1NCA2MDIuODg3SDUyOC4wMTNWNjY4LjM4N0g2NDcuNzUzQzY1OC4wNzEgNjY4LjM4NyA2NjQuMzA4IDY2OC4zODcgNjcyLjU0NyA2NjAuMTA0TDcyMi4yMTMgNjEwLjYzNkM3MzAuNDUzIDYwMi40MjkgNzMwLjQ1MyA1OTQuMTQ3IDczMC40NTMgNTg1Ljg2M1YzMjIuMDM1QzczMC40NTMgMzA1LjU0NiA3MjIuMjEzIDI4OS4wNTcgNzA1LjY1OCAyODAuODVMNTQ4LjQyMSAyMTQuODkzQzUzMS44NjUgMjA2LjY4NyA1MTUuMzEgMjA2LjY4NyA1MTUuMzEgMjA2LjY4N0g0MzMuNTEyTDQzMy41MTIgMjcyLjY0NEg2NTYuMDY5QzY2NC4zMDggMjcyLjY0NCA2NjQuMzA4IDI4MC44NSA2NjQuMzA4IDI4MC44NVY1OTQuMTQ2QzY2NC4zMDggNTk0LjE0NiA2NjQuMzA4IDYwMi40MjkgNjU2LjA2OSA2MDIuNDI5SDUyOC4yNjJWNTM3LjM5NkgyNjkuMDc1QzI2OS4wNzUgNTQzLjcwNyAyNjkuMDE3IDU5Ni45MTIgMjY5LjAxIDYwMi40MjlaIiBmaWxsPSIjRkJDQjRBIi8+CjxwYXRoIGQ9Ik0yNjkuMDA5IDQzNi4xNzJINTI4LjI2MlYzNzAuNjgxSDI2OS4wNzVDMjY5LjA3NSAzNzcuMzczIDI2OS4wMDkgNDM2Ljc4OCAyNjkuMDA5IDQzNi4xNzJaIiBmaWxsPSIjRkJDQjRBIi8+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfZF81MTEyXzc4MiIgeD0iLTQiIHk9IjAiIHdpZHRoPSI4MDgiIGhlaWdodD0iODA4IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQgZHk9IjQiLz4KPGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIvPgo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJvdXQiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMjUgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9ImVmZmVjdDFfZHJvcFNoYWRvd181MTEyXzc4MiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd181MTEyXzc4MiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPC9kZWZzPgo8L3N2Zz4K";
4+
"data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAwIiBoZWlnaHQ9IjgwMCIgdmlld0JveD0iMCAwIDgwMCA4MDAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxnIGZpbHRlcj0idXJsKCNmaWx0ZXIwX2RfNTExMl83ODIpIj4KPHBhdGggZD0iTTQ2OS4yMzYgNzBDNDgyLjM5IDcwIDQ5My4wNTMgODAuNjYzIDQ5My4wNTMgOTMuODE2NFYxNDcuMTQ3TDUxNS4zMzggMTQ3LjE0N0w1MTUuNDI4IDE0Ny4xNDdMNTE1LjU1NCAxNDcuMTQ3TDUxNS44MjYgMTQ3LjE0OUM1MTYuMDE2IDE0Ny4xNTEgNTE2LjIyNSAxNDcuMTUzIDUxNi40NTEgMTQ3LjE1N0M1MTYuOTA0IDE0Ny4xNjQgNTE3LjQyOCAxNDcuMTc2IDUxOC4wMiAxNDcuMTk1QzUxOS4yMDEgMTQ3LjIzNCA1MjAuNjYgMTQ3LjMwNCA1MjIuMzYxIDE0Ny40MjRDNTI1Ljc0MSAxNDcuNjYzIDUzMC4xODUgMTQ4LjExNCA1MzUuMzYzIDE0OC45NjlDNTQ1LjAwMSAxNTAuNTYyIDU1OC41NTYgMTUzLjc4IDU3Mi45MTggMTYwLjYwM0w3MzAuNDIgMjI2LjY3MUw3MzIuMTAxIDIyNy41MDVDNzcxLjc4NyAyNDcuMTc3IDc4OS45OTMgMjg2LjI5NiA3ODkuOTkzIDMyMi4wMzZWNTg1Ljg2NUM3ODkuOTkzIDU4Ni4wNTQgNzg5Ljk5NCA1ODYuMjU0IDc4OS45OTQgNTg2LjQ2M0w3ODkuOTk2IDU4Ni45MTNDNzkwLjAzOCA1OTcuMDk2IDc5MC4xNjEgNjI2Ljk5NiA3NjQuMjMxIDY1Mi44MjNMNzE0Ljc2IDcwMi4wOTVMNzE0LjY0MSA3MDIuMjE1QzcwNC42MDEgNzEyLjI3NSA2OTIuMTIzIDcyMC42NTIgNjc2LjI4NCA3MjQuODc5QzY2NC4zOSA3MjguMDU0IDY1Mi44MjcgNzI3Ljk2NiA2NDguNjM3IDcyNy45MzRMNjQ4LjYxOSA3MjcuOTMzQzY0OC40MDkgNzI3LjkzMiA2NDguMjE5IDcyNy45MyA2NDguMDQ3IDcyNy45M0w2NDcuNzUyIDcyNy45MjlINDgwLjcyMUM0NzQuMDk0IDcyNy45MjkgNDY4LjcyMSA3MjIuNTU2IDQ2OC43MjEgNzE1LjkyOVY2NjguMzg4SDMyOC41ODZDMzI4LjU4NiA2NzIuNjI5IDMyOC41NzIgNjk4LjA1MiAzMjguNTYxIDcxNS45NDRDMzI4LjU1NyA3MjIuNTY5IDMyMy4xODYgNzI3LjkyOSAzMTYuNTYxIDcyNy45MjlIMTUyLjI0NkMxNTIuMTA0IDcyNy45MjkgMTUxLjk0MiA3MjcuOTI5IDE1MS43NjIgNzI3LjkzMUwxNTEuMzYyIDcyNy45MzRDMTQ3LjE3MiA3MjcuOTY2IDEzNS42MDkgNzI4LjA1NCAxMjMuNzE0IDcyNC44NzlDMTA3Ljg3MyA3MjAuNjUxIDk1LjM5MzggNzEyLjI3MiA4NS4zNTI5IDcwMi4yMUw4NS4yMzg2IDcwMi4wOTVMMzUuNjcgNjUyLjcyNUwzNS41NzIzIDY1Mi42MjdDOS44NjI0MiA2MjYuNzggOS45NjY3IDU5Ny4xODUgMTAuMDAzIDU4Ni44NzRDMTAuMDA0MyA1ODYuNTEzIDEwLjAwNTUgNTg2LjE3NyAxMC4wMDU1IDU4NS44NjVWMzIyLjAzNkMxMC4wMDU1IDI4Ni40MyAyOC4xNjYyIDI0Ny4xOTkgNjcuODk3NyAyMjcuNTA1TDY5LjU3OSAyMjYuNjcxTDIyNy4wODEgMTYwLjYwM0MyNDEuNDQzIDE1My43OCAyNTQuOTk4IDE1MC41NjIgMjY0LjYzNiAxNDguOTY5QzI2OS44MTQgMTQ4LjExNCAyNzQuMjU4IDE0Ny42NjMgMjc3LjYzOCAxNDcuNDI0QzI3OS4zMzggMTQ3LjMwNCAyODAuNzk4IDE0Ny4yMzQgMjgxLjk3OSAxNDcuMTk1QzI4Mi41NzEgMTQ3LjE3NiAyODMuMDk1IDE0Ny4xNjQgMjgzLjU0NyAxNDcuMTU3TDI4My45MTcgMTQ3LjE1MkwyODQuMTczIDE0Ny4xNDlMMjg0LjQ0NSAxNDcuMTQ3TDI4NC41NzEgMTQ3LjE0N0wyODQuNjYgMTQ3LjE0N0wzMDYuOTQyIDE0Ny4xNDdWOTMuODE2NEMzMDYuOTQyIDgwLjY2MyAzMTcuNjA1IDcwIDMzMC43NTggNzBINDY5LjIzNloiIGZpbGw9IiMxOTFBMUEiLz4KPHBhdGggZD0iTTM2Ni40ODMgMTI5LjU0SDQzMy41MTJWMjA2LjY4N0gzNjYuNDgzVjEyOS41NFoiIGZpbGw9IiNGQkNCNEEiLz4KPHBhdGggZD0iTTI2OS4wMSA2MDIuNDI5SDE0NC4wMDhDMTM1Ljc2OCA2MDIuNDI5IDEzNS43NjggNTk0LjE0NiAxMzUuNzY4IDU5NC4xNDZWMjgwLjg1QzEzNS43NjggMjgwLjg1IDEzNS43NjggMjcyLjY0NCAxNDQuMDA4IDI3Mi42NDRIMzY2LjQ4M0wzNjYuNDgzIDIwNi42ODdIMjg0LjY5QzI4NC42OSAyMDYuNjg3IDI2OC4xMzQgMjA2LjY4NyAyNTEuNTc5IDIxNC44OTNMOTQuMzQxNCAyODAuODVDNzcuNzg2MSAyODkuMDU3IDY5LjU0NjkgMzA1LjYyMyA2OS41NDY5IDMyMi4wMzVWNTg1Ljg2M0M2OS41NDY5IDU5NC4xNDcgNjkuNTQ2OSA2MDIuMzUzIDc3Ljc4NjEgNjEwLjYzNkwxMjcuNDUyIDY2MC4xMDRDMTM1LjY5MSA2NjguMzg3IDE0MS45MjggNjY4LjM4NyAxNTIuMjQ3IDY2OC4zODdIMjY5LjAyOUMyNjkuMDM3IDY0OC4zNCAyNjkuMDQ2IDYyNC42NTUgMjY5LjA1NCA2MDIuODg3SDUyOC4wMTNWNjY4LjM4N0g2NDcuNzUzQzY1OC4wNzEgNjY4LjM4NyA2NjQuMzA4IDY2OC4zODcgNjcyLjU0NyA2NjAuMTA0TDcyMi4yMTMgNjEwLjYzNkM3MzAuNDUzIDYwMi40MjkgNzMwLjQ1MyA1OTQuMTQ3IDczMC40NTMgNTg1Ljg2M1YzMjIuMDM1QzczMC40NTMgMzA1LjU0NiA3MjIuMjEzIDI4OS4wNTcgNzA1LjY1OCAyODAuODVMNTQ4LjQyMSAyMTQuODkzQzUzMS44NjUgMjA2LjY4NyA1MTUuMzEgMjA2LjY4NyA1MTUuMzEgMjA2LjY4N0g0MzMuNTEyTDQzMy41MTIgMjcyLjY0NEg2NTYuMDY5QzY2NC4zMDggMjcyLjY0NCA2NjQuMzA4IDI4MC44NSA2NjQuMzA4IDI4MC44NVY1OTQuMTQ2QzY2NC4zMDggNTk0LjE0NiA2NjQuMzA4IDYwMi40MjkgNjU2LjA2OSA2MDIuNDI5SDUyOC4yNjJWNTM3LjM5NkgyNjkuMDc1QzI2OS4wNzUgNTQzLjcwNyAyNjkuMDE3IDU5Ni45MTIgMjY5LjAxIDYwMi40MjlaIiBmaWxsPSIjRkJDQjRBIi8+CjxwYXRoIGQ9Ik0yNjkuMDA5IDQzNi4xNzJINTI4LjI2MlYzNzAuNjgxSDI2OS4wNzVDMjY5LjA3NSAzNzcuMzczIDI2OS4wMDkgNDM2Ljc4OCAyNjkuMDA5IDQzNi4xNzJaIiBmaWxsPSIjRkJDQjRBIi8+CjwvZz4KPGRlZnM+CjxmaWx0ZXIgaWQ9ImZpbHRlcjBfZF81MTEyXzc4MiIgeD0iLTQiIHk9IjAiIHdpZHRoPSI4MDgiIGhlaWdodD0iODA4IiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIGNvbG9yLWludGVycG9sYXRpb24tZmlsdGVycz0ic1JHQiI+CjxmZUZsb29kIGZsb29kLW9wYWNpdHk9IjAiIHJlc3VsdD0iQmFja2dyb3VuZEltYWdlRml4Ii8+CjxmZUNvbG9yTWF0cml4IGluPSJTb3VyY2VBbHBoYSIgdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDEyNyAwIiByZXN1bHQ9ImhhcmRBbHBoYSIvPgo8ZmVPZmZzZXQgZHk9IjQiLz4KPGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIvPgo8ZmVDb21wb3NpdGUgaW4yPSJoYXJkQWxwaGEiIG9wZXJhdG9yPSJvdXQiLz4KPGZlQ29sb3JNYXRyaXggdHlwZT0ibWF0cml4IiB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMjUgMCIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluMj0iQmFja2dyb3VuZEltYWdlRml4IiByZXN1bHQ9ImVmZmVjdDFfZHJvcFNoYWRvd181MTEyXzc4MiIvPgo8ZmVCbGVuZCBtb2RlPSJub3JtYWwiIGluPSJTb3VyY2VHcmFwaGljIiBpbjI9ImVmZmVjdDFfZHJvcFNoYWRvd181MTEyXzc4MiIgcmVzdWx0PSJzaGFwZSIvPgo8L2ZpbHRlcj4KPC9kZWZzPgo8L3N2Zz4K"
55

6-
const RPC_SEPOLIA = "https://api.cartridge.gg/x/starknet/sepolia";
7-
const RPC_MAINNET = "https://api.cartridge.gg/x/starknet/mainnet";
6+
const RPC_SEPOLIA = "https://api.cartridge.gg/x/starknet/sepolia"
7+
const RPC_MAINNET = "https://api.cartridge.gg/x/starknet/mainnet"
88

99
export const RPC_URLS = {
1010
[constants.StarknetChainId.SN_SEPOLIA]: RPC_SEPOLIA,
1111
[constants.StarknetChainId.SN_MAIN]: RPC_MAINNET,
12-
};
12+
}

‎src/connectors/controller/index.ts‎

Lines changed: 92 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,81 @@
1-
import type { ProviderOptions, ProviderInterface, AccountInterface } from "starknet"
2-
import { constants } from "starknet";
3-
4-
import type { RequestFnCall, RpcMessage, RpcTypeToMessageMap, StarknetWindowObject, TypedData } from "@starknet-io/types-js"
5-
6-
import Controller, { type ControllerOptions } from "@cartridge/controller";
1+
import type {
2+
ProviderOptions,
3+
ProviderInterface,
4+
AccountInterface,
5+
} from "starknet"
6+
import { constants } from "starknet"
7+
8+
import type {
9+
RequestFnCall,
10+
RpcMessage,
11+
RpcTypeToMessageMap,
12+
StarknetWindowObject,
13+
TypedData,
14+
} from "@starknet-io/types-js"
15+
16+
import Controller, { type ControllerOptions } from "@cartridge/controller"
717
import { Connector, type ConnectArgs, type ConnectorData } from "../connector"
8-
import { ConnectorNotConnectedError, UserNotConnectedError, UserRejectedRequestError } from "../../errors"
18+
import {
19+
ConnectorNotConnectedError,
20+
UserNotConnectedError,
21+
UserRejectedRequestError,
22+
} from "../../errors"
923

10-
import { CONTROLLER_ICON, RPC_URLS } from "./constants";
24+
import { CONTROLLER_ICON, RPC_URLS } from "./constants"
1125

1226
export class ControllerConnector extends Connector {
13-
private controller: Controller | null;
27+
private controller: Controller | null
1428

1529
constructor(options: Partial<ControllerOptions> = {}) {
16-
super();
30+
super()
1731

1832
// Can pass in defaultChainId = SN_SEPOLIA to connect to Sepolia testnet
19-
options.defaultChainId = options.defaultChainId || constants.StarknetChainId.SN_MAIN;
20-
options.chains = options.chains || [{ rpcUrl: RPC_URLS[options.defaultChainId as keyof typeof RPC_URLS] }];
33+
options.defaultChainId =
34+
options.defaultChainId || constants.StarknetChainId.SN_MAIN
35+
options.chains = options.chains || [
36+
{ rpcUrl: RPC_URLS[options.defaultChainId as keyof typeof RPC_URLS] },
37+
]
2138

2239
this.controller = this.available()
2340
? new Controller(options as ControllerOptions)
24-
: null;
41+
: null
2542
}
2643

27-
get id() { return "cartridgeController" }
28-
get name() { return "Cartridge Controller" }
29-
get icon() { return { light: CONTROLLER_ICON, dark: CONTROLLER_ICON } }
44+
get id() {
45+
return "cartridgeController"
46+
}
47+
get name() {
48+
return "Cartridge Controller"
49+
}
50+
get icon() {
51+
return { light: CONTROLLER_ICON, dark: CONTROLLER_ICON }
52+
}
3053

3154
available() {
32-
return typeof window !== "undefined";
55+
return typeof window !== "undefined"
3356
}
3457

3558
async ready() {
3659
if (!this.controller) {
37-
return false;
60+
return false
3861
}
3962

40-
const account = await this.controller.probe();
41-
return account !== null;
63+
const account = await this.controller.probe()
64+
return account !== null
4265
}
4366

4467
async connect(_args?: ConnectArgs): Promise<ConnectorData> {
45-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
68+
if (!this.controller) {
69+
throw new ConnectorNotConnectedError()
70+
}
4671

47-
const account = await this.controller.connect();
72+
const account = await this.controller.connect()
4873

49-
if (!account) { throw new UserNotConnectedError(); }
74+
if (!account) {
75+
throw new UserNotConnectedError()
76+
}
5077

51-
const chainId = await this.chainId();
78+
const chainId = await this.chainId()
5279

5380
/**
5481
* @dev This emit ensures compatibility with starknet-react
@@ -57,67 +84,83 @@ export class ControllerConnector extends Connector {
5784

5885
return {
5986
account: account.address,
60-
chainId: chainId
61-
};
87+
chainId: chainId,
88+
}
6289
}
6390

6491
async disconnect(): Promise<void> {
65-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
92+
if (!this.controller) {
93+
throw new ConnectorNotConnectedError()
94+
}
6695

6796
/**
6897
* @dev This emit ensures compatibility with starknet-react
6998
*/
7099
this.emit("disconnect")
71100

72-
return this.controller.disconnect();
101+
return this.controller.disconnect()
73102
}
74103

75-
async account(_provider: ProviderOptions | ProviderInterface): Promise<AccountInterface> {
76-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
104+
async account(
105+
_provider: ProviderOptions | ProviderInterface,
106+
): Promise<AccountInterface> {
107+
if (!this.controller) {
108+
throw new ConnectorNotConnectedError()
109+
}
77110

78-
const account = await this.controller.probe();
111+
const account = await this.controller.probe()
79112

80-
if (!account) { throw new UserNotConnectedError(); }
113+
if (!account) {
114+
throw new UserNotConnectedError()
115+
}
81116

82-
return account;
117+
return account
83118
}
84119

85120
async chainId(): Promise<bigint> {
86-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
121+
if (!this.controller) {
122+
throw new ConnectorNotConnectedError()
123+
}
87124

88-
const account = await this.controller.probe();
125+
const account = await this.controller.probe()
89126

90-
if (!account) { throw new UserNotConnectedError(); }
127+
if (!account) {
128+
throw new UserNotConnectedError()
129+
}
91130

92-
return BigInt(await account.getChainId());
131+
return BigInt(await account.getChainId())
93132
}
94133

95134
async request<T extends RpcMessage["type"]>(
96-
call: RequestFnCall<T>
135+
call: RequestFnCall<T>,
97136
): Promise<RpcTypeToMessageMap[T]["result"]> {
98-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
137+
if (!this.controller) {
138+
throw new ConnectorNotConnectedError()
139+
}
99140

100141
// Handle SNIP-12 compliance for signTypedData requests
101142
if (call.type === "wallet_signTypedData") {
102-
const params = call.params as TypedData;
143+
const params = call.params as TypedData
103144
if (!params.types.StarknetDomain) {
104-
throw new Error(
105-
`Controller requires a SNIP-12 version 1 domain separator. ` +
106-
`See: https://github.com/starknet-io/SNIPs/blob/main/SNIPS/snip-12.md#domain-separator`
107-
);
108-
}
145+
throw new Error(
146+
`Controller requires a SNIP-12 version 1 domain separator. ` +
147+
`See: https://github.com/starknet-io/SNIPs/blob/main/SNIPS/snip-12.md#domain-separator`,
148+
)
149+
}
109150
}
110151

111152
try {
112-
return await this.controller.request(call);
153+
return await this.controller.request(call)
113154
} catch {
114-
throw new UserRejectedRequestError();
155+
throw new UserRejectedRequestError()
115156
}
116157
}
117158

118159
get wallet(): StarknetWindowObject {
119-
if (!this.controller) { throw new ConnectorNotConnectedError(); }
160+
if (!this.controller) {
161+
throw new ConnectorNotConnectedError()
162+
}
120163

121-
return this.controller;
164+
return this.controller
122165
}
123166
}

‎src/connectors/injected/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export class InjectedConnector extends Connector {
168168
params: { silent_mode: true },
169169
})
170170

171-
return new WalletAccount(provider, this._wallet, undefined, accounts[0])
171+
return new WalletAccount(provider, this._wallet, accounts[0], undefined)
172172
}
173173

174174
async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {

‎src/connectors/webwallet/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ export class WebWalletConnector extends Connector {
273273
throw new ConnectorNotConnectedError()
274274
}
275275

276-
return new WalletAccount(provider, this._wallet, undefined, _address)
276+
return new WalletAccount(provider, this._wallet, _address, undefined)
277277
}
278278

279279
async chainId(): Promise<bigint> {

0 commit comments

Comments
 (0)