Skip to content

Commit 7ac67d4

Browse files
jesssekeoghjesssekeogh
committed
fixing Anvil migration + updating content
1 parent 9a68fae commit 7ac67d4

File tree

21 files changed

+1869
-1585
lines changed

21 files changed

+1869
-1585
lines changed

‎package-lock.json

+1,546-1,343
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@
5050
"@emotion/react": "^11.10.4",
5151
"@emotion/styled": "^11.10.4",
5252
"@reduxjs/toolkit": "^1.8.5",
53+
"@vvv-interactive/nftanvil-canisters": "^0.41.0",
5354
"@vvv-interactive/nftanvil-react": "^0.41.0",
54-
"@vvv-interactive/nftanvil-tools": "^0.35.0",
55+
"@vvv-interactive/nftanvil-tools": "^0.41.0",
5556
"candb-client-typescript": "^0.0.0-alpha.1",
5657
"dompurify": "^2.4.1",
5758
"dotenv": "^16.0.1",

‎patches/@vvv-interactive+nftanvil-react+0.41.0.patch

+37-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
diff --git a/node_modules/@vvv-interactive/nftanvil-react/cjs/reducers/nft.js b/node_modules/@vvv-interactive/nftanvil-react/cjs/reducers/nft.js
2-
index b186112..89e307c 100644
2+
index b186112..88eb419 100644
33
--- a/node_modules/@vvv-interactive/nftanvil-react/cjs/reducers/nft.js
44
+++ b/node_modules/@vvv-interactive/nftanvil-react/cjs/reducers/nft.js
5-
@@ -738,6 +738,8 @@ const nft_mint = vals => async (dispatch, getState) => {
5+
@@ -189,7 +189,9 @@ const nft_purchase = _ref2 => {
6+
let {
7+
id,
8+
amount,
9+
- affiliate = []
10+
+ affiliate = [],
11+
+ payment_token_kind = {normal:null},
12+
+ payment_token = 1,
13+
} = _ref2;
14+
return async (dispatch, getState) => {
15+
let s = getState();
16+
@@ -211,6 +213,8 @@ const nft_purchase = _ref2 => {
17+
user: {
18+
address: AccountIdentifier.TextToArray(address)
19+
},
20+
+ payment_token_kind,
21+
+ payment_token,
22+
subaccount,
23+
affiliate,
24+
amount
25+
@@ -738,6 +742,8 @@ const nft_mint = vals => async (dispatch, getState) => {
626
let subaccount = [AccountIdentifier.TextToArray(s.user.subaccount) || null].filter(Boolean);
727
if (!address) throw Error("Annonymous cant mint"); // Wont let annonymous mint
828

@@ -11,7 +31,7 @@ index b186112..89e307c 100644
1131
try {
1232
var _mrez$err, _mrez$err2, _vals$content$, _vals$content$$intern, _vals$thumb, _vals$thumb$internal;
1333

14-
@@ -766,7 +768,7 @@ const nft_mint = vals => async (dispatch, getState) => {
34+
@@ -766,7 +772,7 @@ const nft_mint = vals => async (dispatch, getState) => {
1535
tokenIndex,
1636
transactionId
1737
} = mrez.ok;
@@ -20,11 +40,24 @@ index b186112..89e307c 100644
2040

2141
if (vals !== null && vals !== void 0 && (_vals$content$ = vals.content[0]) !== null && _vals$content$ !== void 0 && (_vals$content$$intern = _vals$content$.internal) !== null && _vals$content$$intern !== void 0 && _vals$content$$intern.url) {
2242
await (0, _data.uploadFile)(nft, tokenIndex, "content", await (0, _data.chunkBlob)(vals.content[0].internal.url), subaccount);
23-
@@ -781,6 +783,7 @@ const nft_mint = vals => async (dispatch, getState) => {
43+
@@ -781,6 +787,7 @@ const nft_mint = vals => async (dispatch, getState) => {
2444
}
2545

2646
dispatch((0, _user.user_refresh_balances)());
2747
+ return id
2848
};
2949

3050
exports.nft_mint = nft_mint;
51+
diff --git a/node_modules/@vvv-interactive/nftanvil-react/src/reducers/nft.js b/node_modules/@vvv-interactive/nftanvil-react/src/reducers/nft.js
52+
index a56fd95..6fbb6ef 100644
53+
--- a/node_modules/@vvv-interactive/nftanvil-react/src/reducers/nft.js
54+
+++ b/node_modules/@vvv-interactive/nftanvil-react/src/reducers/nft.js
55+
@@ -193,7 +193,7 @@ const nft_fetch_file = async (
56+
};
57+
58+
export const nft_purchase =
59+
- ({ id, amount, affiliate = [] }) =>
60+
+ ({ id, amount, affiliate = []}) =>
61+
async (dispatch, getState) => {
62+
let s = getState();
63+

‎src/declarations/ito/ito.did

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type Class =
4444
add: (TokenIdentifier) -> (Result_3);
4545
airdrop_add: (blob) -> (Result_3);
4646
airdrop_use: (AccountIdentifier, blob) -> (Result_4);
47-
buy_tx: (TransactionId, opt SubAccount) -> (Result_4);
47+
buy_tx: (nat, TransactionId, opt SubAccount) -> (Result_4);
4848
claim: (AccountIdentifier, opt SubAccount, TokenIdentifier) -> (Result_3);
4949
icp_balance: () -> (Result_2);
5050
icp_transfer: (AccountIdentifier, Balance) -> (Result_1);

‎src/declarations/ito/ito.did.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export interface Class {
1111
'add' : ActorMethod<[TokenIdentifier], Result_3>,
1212
'airdrop_add' : ActorMethod<[Array<number>], Result_3>,
1313
'airdrop_use' : ActorMethod<[AccountIdentifier, Array<number>], Result_4>,
14-
'buy_tx' : ActorMethod<[TransactionId, [] | [SubAccount]], Result_4>,
14+
'buy_tx' : ActorMethod<[bigint, TransactionId, [] | [SubAccount]], Result_4>,
1515
'claim' : ActorMethod<
1616
[AccountIdentifier, [] | [SubAccount], TokenIdentifier],
1717
Result_3,

‎src/declarations/ito/ito.did.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ export const idlFactory = ({ IDL }) => {
3838
[Result_4],
3939
[],
4040
),
41-
'buy_tx' : IDL.Func([TransactionId, IDL.Opt(SubAccount)], [Result_4], []),
41+
'buy_tx' : IDL.Func(
42+
[IDL.Nat, TransactionId, IDL.Opt(SubAccount)],
43+
[Result_4],
44+
[],
45+
),
4246
'claim' : IDL.Func(
4347
[AccountIdentifier, IDL.Opt(SubAccount), TokenIdentifier],
4448
[Result_3],

‎src/declarations/ito/ito.old.did

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ service : {
5353
add: (TokenIdentifier) -> (Result_3);
5454
airdrop_add: (blob) -> (Result_3);
5555
airdrop_use: (AccountIdentifier, blob) -> (Result_4);
56-
buy_tx: (TransactionId, opt SubAccount) -> (Result_4);
56+
buy_tx: (nat, TransactionId, opt SubAccount) -> (Result_4);
5757
claim: (AccountIdentifier, opt SubAccount, TokenIdentifier) -> (Result_3);
5858
icp_balance: () -> (Result_2);
5959
icp_transfer: (AccountIdentifier, Balance) -> (Result_1);

‎src/declarations/ito/ito.old.most

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Version: 1.0.0
2+
type AccountIdentifier__1 = Blob;
3+
type AccountRecordSerialized__2 = {tokens : [TokenIdentifier__1]};
4+
type TokenIdentifier__1 = Nat64;
5+
type TransactionId = Blob;
6+
actor {
7+
stable var LEFT_AIRDROP : Nat;
8+
stable var LEFT_PURCHASE : Nat;
9+
stable var _codes : [var ?Blob];
10+
stable var _tmpAccount :
11+
[(AccountIdentifier__1, AccountRecordSerialized__2)];
12+
stable var _tmpUsed : [(TransactionId, Bool)];
13+
stable var _tokens : [var ?TokenIdentifier__1];
14+
stable var admin : Principal;
15+
stable var airdrop_codes : Nat;
16+
stable var count_available : Nat;
17+
stable var count_total_added : Nat;
18+
stable var last_given_idx : Nat;
19+
stable var randomNumber : Nat
20+
};

0 commit comments

Comments
 (0)