Skip to content

Commit 85a676f

Browse files
committed
Fix import resolution
1 parent 3a74879 commit 85a676f

11 files changed

Lines changed: 6346 additions & 8931 deletions

File tree

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,7 @@ yarn-error.log*
3636
.vercel
3737

3838
.idea
39-
/.env
39+
/.env
40+
41+
# private keys
42+
*.pkey

‎cadence/scripts/getAccounts.cdc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FCL from 0xFCL
1+
import "FCL"
22

33
access(all) fun main(): &[FCL.FCLAccount] {
44
return FCL.accounts().values

‎cadence/transactions/addAccount.cdc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FCL from 0xFCL
1+
import "FCL"
22

33
transaction(address: Address, label: String, scopes: [String]) {
44
prepare(acct: &Account) {

‎cadence/transactions/fundFLOW.cdc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import FlowToken from 0xFlowToken
2-
import FungibleToken from 0xFungibleToken
1+
import "FlowToken"
2+
import "FungibleToken"
33

44
transaction(address: Address, amount: UFix64) {
55
let tokenAdmin: &FlowToken.Administrator

‎cadence/transactions/newAccount.cdc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import FCL from 0xFCL
2-
import FlowToken from 0xFlowToken
3-
import FungibleToken from 0xFungibleToken
1+
import "FCL"
2+
import "FlowToken"
3+
import "FungibleToken"
44

55
/// This transaction creates a new account and funds it with
66
/// an initial balance of FLOW tokens.

‎cadence/transactions/updateAccount.cdc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FCL from 0xFCL
1+
import "FCL"
22

33
transaction(address: Address, label: String, scopes: [String]) {
44
prepare() {

‎flow.json‎

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
{
22
"contracts": {
3-
"FCL": {
4-
"source": "./cadence/contracts/FCL.cdc",
3+
"FCL": "./cadence/contracts/FCL.cdc",
4+
"FCLCrypto": {
5+
"source": "./cadence/contracts/FCLCrypto.cdc",
56
"aliases": {
6-
"emulator": "f8d6e0586b0a20c7",
7-
"mainnet": "e467b9dd11fa00df",
8-
"testnet": "8c5303eaa26202d6"
7+
"mainnet": "b4b82a1c9d21d284",
8+
"testnet": "74daa6f9c7ef24b1"
99
}
10-
},
11-
"FCLCrypto": "./cadence/contracts/FCLCrypto.cdc"
10+
}
1211
},
1312
"dependencies": {
1413
"Burner": {
@@ -83,15 +82,35 @@
8382
"accounts": {
8483
"emulator-account": {
8584
"address": "f8d6e0586b0a20c7",
86-
"key": "f8e188e8af0b8b414be59c4a1a15cc666c898fb34d94156e9b51e18bfde754a5"
85+
"key": {
86+
"type": "file",
87+
"location": "./emulator-account.pkey"
88+
}
8789
},
8890
"mainnet-account": {
8991
"address": "e467b9dd11fa00df",
90-
"key": "0000000000000000000000000000000000000000000000000000000000000000"
92+
"key": {
93+
"type": "file",
94+
"location": "./mainnet-account.pkey"
95+
}
9196
},
9297
"testnet-account": {
9398
"address": "8c5303eaa26202d6",
94-
"key": "0000000000000000000000000000000000000000000000000000000000000000"
99+
"key": {
100+
"type": "file",
101+
"location": "./testnet-account.pkey"
102+
}
103+
}
104+
},
105+
"deployments": {
106+
"emulator": {
107+
"emulator-account": ["FCL", "FCLCrypto"]
108+
},
109+
"mainnet": {
110+
"mainnet-account": ["FCL"]
111+
},
112+
"testnet": {
113+
"testnet-account": ["FCL"]
95114
}
96115
}
97116
}

‎next-env.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference path="./.next/types/routes.d.ts" />
34

45
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
6+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

0 commit comments

Comments
 (0)