Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch Axelar libs #911

Closed
wants to merge 188 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
1982787
wip: add full flow squad
hthieu1110 Mar 21, 2023
ad49271
wip: add missing squad contract client
hthieu1110 Mar 21, 2023
00dd5db
chore: add comment about approve vs setApprovalForAll
hthieu1110 Mar 21, 2023
ef59141
wip: add gitignnore target substream
hthieu1110 Apr 4, 2023
669c38d
wip: add substreams eth
hthieu1110 Apr 5, 2023
3b6ed6b
wip: add env + go.mod
hthieu1110 Apr 5, 2023
cd5e926
wip: rebase on main
hthieu1110 Apr 5, 2023
67fbb97
wip: working intergrated substreams
hthieu1110 Apr 5, 2023
4b15ebe
wip: update proto to add contract
hthieu1110 Apr 5, 2023
0ffa74b
wip: update code sinker
hthieu1110 Apr 5, 2023
1a3f92d
Merge branch 'feat/p2e-eth' of github.com:TERITORI/teritori-dapp into…
hthieu1110 Apr 5, 2023
8c9af24
wip: add handler dispatcher
hthieu1110 Apr 10, 2023
97ec6b1
wip: update code
hthieu1110 Apr 14, 2023
aadd22b
wip
hthieu1110 Apr 24, 2023
eb725be
wip: merge with main
hthieu1110 Apr 24, 2023
f3bb853
wip: add abi gen + handle squad stake
hthieu1110 Apr 24, 2023
92ca6b2
wip: refactor for abi_go + abi_jsonn
hthieu1110 Apr 24, 2023
6e8c0cf
wip: remove unneeded abi json from code
hthieu1110 Apr 24, 2023
3dfa364
wip: working intialize collection
hthieu1110 Apr 26, 2023
5335531
wip: add mint nft to eth indexer
hthieu1110 Apr 26, 2023
677ed9a
wip: indexed created NFT
hthieu1110 Apr 27, 2023
09f219d
wip: add squad stake
hthieu1110 Apr 27, 2023
7c3d305
wip: add squad stake handler
hthieu1110 Apr 28, 2023
01b2666
wip: add squadstake + refactor
hthieu1110 Apr 28, 2023
ab86803
wip: added handler for unstaking
hthieu1110 Apr 29, 2023
0f2fbd8
wip: refactor: replace DBloader from Sinker by teritori indexerDB
hthieu1110 Apr 29, 2023
722feb2
wip: add missing file for prev commit
hthieu1110 Apr 29, 2023
897deec
Wip: fix initialize handler + retest full index testnet
hthieu1110 May 3, 2023
10981fd
wip: handle vault: list, cancel, buy
hthieu1110 May 3, 2023
34630f7
wip: handle stake/unstake/nfts by index eth
hthieu1110 May 4, 2023
aa3ec48
wip: integrate eth indexer to dapp flow: squadstake, leaderboard, mar…
hthieu1110 May 4, 2023
eb1b8ba
wip: use network instead of networkID
hthieu1110 May 4, 2023
0a57d17
wip: integration with front
hthieu1110 May 6, 2023
a9c3694
merge with main
hthieu1110 May 9, 2023
a544edd
wip: refactor to add p2e-update for eth
hthieu1110 May 9, 2023
34b3792
chore: rebuild yarn.lock
hthieu1110 May 10, 2023
386e24a
fix: replace networkKind = networkIId
hthieu1110 May 10, 2023
3faad92
wip: refactor indexeraction
hthieu1110 May 15, 2023
cc572ae
Merge branch 'main' into feat/p2e-eth
hthieu1110 May 15, 2023
c178f83
wip: implement merketree with doubled impair node
hthieu1110 May 18, 2023
d778396
wip: implement merketree with doubled impair node
hthieu1110 May 18, 2023
891104a
wip: implement merkletree algo for impair nodes
hthieu1110 May 18, 2023
01f7ebe
wip: implement custom version of merkle tree
hthieu1110 May 18, 2023
ac3f7d8
wip: working save treedata to DB + generate proof from saved tree data
hthieu1110 May 19, 2023
6092684
chore: remove test code
hthieu1110 May 19, 2023
378403b
chore: merge with main
hthieu1110 Jul 12, 2023
79bac1a
feat: use network features to handle p2e menu
hthieu1110 Jul 13, 2023
56de2a6
wip: refactor with new version of substreams
hthieu1110 Jul 19, 2023
1467fc7
wip: update with new libs
Jul 19, 2023
8ebffb7
wip
Jul 19, 2023
d398735
feat: indexer works with rpc v2 + new endpoints firehose
hthieu1110 Jul 19, 2023
be916b7
feat: done update merke root to distributor
Jul 21, 2023
3d77516
feat: add update distributor merkle root
Jul 21, 2023
445454a
wip: send rewards
hthieu1110 Jul 21, 2023
2f6a822
Merge branch 'feat/p2e-eth' of https://github.com/TERITORI/teritori-d…
hthieu1110 Jul 21, 2023
00ec6d7
wip
Jul 21, 2023
07485ef
feat: update merkle tree + claim
hthieu1110 Jul 22, 2023
3786a52
chore: remove .env key
hthieu1110 Jul 22, 2023
746a850
chore(p2e): linter and other fixes
omniwired Jul 24, 2023
576a6da
chore(p2e): linter and tsc update
omniwired Jul 24, 2023
34037e1
fix(p2e): build
omniwired Jul 25, 2023
fa7ce77
wip
Jul 27, 2023
a386b49
feat: handle claimed amount + done claim
hthieu1110 Jul 27, 2023
f2fcfd5
fix: fix buf lint
Jul 28, 2023
60f9e8c
Mergeremote-tracking branch 'origin/main' into feat/p2e-eth
hthieu1110 Aug 1, 2023
4d0b036
chore: remove credentials
hthieu1110 Aug 5, 2023
2ef9ce4
merge
hthieu1110 Aug 5, 2023
4c6409b
merge with main
hthieu1110 Aug 7, 2023
eb6734c
Merge remote-tracking branch 'origin/main' into feat/p2e-eth
omniwired Aug 14, 2023
d69a746
chore(protobuf): Generate API
omniwired Aug 14, 2023
8a81d60
add mumbai substreams
hthieu1110 Oct 2, 2023
3aaae74
wip: integrate axelar nft
hthieu1110 Oct 2, 2023
0a1cc09
wip: brided + indexer ok. Now start to work on Squadstake
hthieu1110 Oct 6, 2023
d853ab3
feat: adapt code to handle bridged NFT
hthieu1110 Oct 11, 2023
4a733ea
merge with the latest upstream
omniwired Oct 11, 2023
6f8ae6b
merge with the latest upstream - part 2
omniwired Oct 11, 2023
dda5b28
feat(p2e-eth): remove unused exports
omniwired Oct 12, 2023
b672522
feat(p2e-eth): remove unused exports
omniwired Oct 12, 2023
2d493cd
feat(p2e-eth): import simplification and "lint" order
omniwired Oct 12, 2023
d4d8352
remove unused file
omniwired Oct 12, 2023
f564e95
add wasm mumbai
hthieu1110 Oct 12, 2023
65fd633
Merge branch 'feat/p2e-eth' of https://github.com/TERITORI/teritori-d…
hthieu1110 Oct 12, 2023
682c0e3
new wasm mumbai
hthieu1110 Oct 13, 2023
395b6d6
feat: handle stake/unstake/update score correctly
hthieu1110 Oct 13, 2023
c2d6d89
merge with main + WEI => network currency
hthieu1110 Oct 17, 2023
893b892
Update cosmwasm mumbai
hthieu1110 Oct 24, 2023
e98c19a
fix: fix lint + add support for bridge token
hthieu1110 Oct 26, 2023
14b9472
adjust code to work with erc20
hthieu1110 Oct 27, 2023
d507cbb
feat: add networkID + add script to clean all by networkID
hthieu1110 Oct 27, 2023
059fa6e
refactor codce
hthieu1110 Oct 27, 2023
3847597
Merge remote-tracking branch 'origin/main' into feat/p2e-eth
hthieu1110 Oct 30, 2023
caa5f63
feat: separate indexer into 2 processes: data vs p2e
hthieu1110 Oct 30, 2023
31cd4d0
feat: use networks package instead of hardcoded NETWORK_IDS
hthieu1110 Nov 1, 2023
ca6c5ad
feat: prepare docker images
hthieu1110 Nov 1, 2023
fd876b7
chore: add missing dockerfiles
hthieu1110 Nov 1, 2023
48e3d8d
fix: quest completion model definition
n0izn0iz Nov 6, 2023
abc0dde
chore: correctly initialize db app
n0izn0iz Nov 6, 2023
bab5ee4
fix: create env file in docker image
n0izn0iz Nov 6, 2023
544662c
chore: explicit import
n0izn0iz Nov 6, 2023
bad0cc1
Revert "fix: create env file in docker image"
n0izn0iz Nov 6, 2023
fdc1dae
chore: add env file in evm indexer image
n0izn0iz Nov 6, 2023
93256f9
fix: fully update flag name
n0izn0iz Nov 6, 2023
aca8fe8
fix: use network id in cursor init
n0izn0iz Nov 6, 2023
33667be
fix: properly update cursor
n0izn0iz Nov 6, 2023
3b67ae7
fix: sql clean data quest network id
n0izn0iz Nov 6, 2023
f1d6251
fix: properly update cursor
n0izn0iz Nov 6, 2023
dd04ecc
feat: use new indexer data in eth backend
n0izn0iz Nov 6, 2023
3083555
fix: filter by network id on collections request
n0izn0iz Nov 7, 2023
b0cefc7
chore: add goerli riot to whitelist
n0izn0iz Nov 7, 2023
d0d1fc2
fix: clean sql scripts
n0izn0iz Nov 7, 2023
de1de0d
fix: handle 60c06040 for initialize contract
hthieu1110 Nov 8, 2023
5b9d5f7
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Nov 12, 2023
f319c7b
chore: don't try to create collection in p2e indexer
n0izn0iz Nov 13, 2023
89f7d95
chore: add newline in flush-data output
n0izn0iz Nov 13, 2023
2e2728a
fix: remove unused env variables
n0izn0iz Nov 13, 2023
76c6f09
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Nov 13, 2023
48a1818
chore: show polygon mumbai collections
n0izn0iz Nov 14, 2023
7495fb8
chore: regen networks.json
n0izn0iz Nov 14, 2023
e746e01
fix: conflict collection creation when running 2 indexer modes at the…
hthieu1110 Nov 14, 2023
9847906
chore: clean uneeded code
hthieu1110 Nov 14, 2023
7e096f7
Create RiotGameBridgeScreen.tsx
dubiella Nov 18, 2023
8c8c379
Create NFTBridge.tsx
dubiella Nov 18, 2023
d6929a1
Update Navigator.tsx
dubiella Nov 18, 2023
d737dcd
Update navigation.ts
dubiella Nov 18, 2023
227b143
Bridge UI Implementation
dubiella Nov 21, 2023
1aef000
refactor react code
hthieu1110 Nov 21, 2023
cbd8f28
wip: working approve/bridge/estimate gas, check how much value we hav…
hthieu1110 Nov 22, 2023
f50d5b4
feat: done estimate gas
hthieu1110 Nov 22, 2023
48e0531
feat: add force feature bridge for p2e
hthieu1110 Nov 22, 2023
e9d5f28
chore: update to new bridge contract
hthieu1110 Nov 23, 2023
65280e8
Update SDK AxelarBridge + indexer
hthieu1110 Nov 23, 2023
7c3d383
fix: handle test bridge in indexer
hthieu1110 Nov 23, 2023
50a49c8
feat: working bridged NFT/collection
hthieu1110 Dec 2, 2023
b2ac4f6
feat: working p2e
hthieu1110 Dec 3, 2023
fc27fd4
fix: fix nft detail screen
hthieu1110 Dec 3, 2023
e952281
chore: update network
hthieu1110 Dec 3, 2023
2083a64
feat: work marketplace + p2e
hthieu1110 Dec 4, 2023
ee8f44e
Wip: merge with main
hthieu1110 Jan 2, 2024
26ada05
fix: incompatiblity between weshnet and substreams otel
n0izn0iz Jan 2, 2024
32f429d
Merge remote-tracking branch 'origin/main' into feat/p2e-eth
hthieu1110 Jan 5, 2024
6c65a17
Merge remote-tracking branch 'origin/main' into feat/p2e-eth
hthieu1110 Jan 10, 2024
5adbd7a
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 10, 2024
0e3b64f
chore: lint
n0izn0iz Jan 11, 2024
6b8d6a2
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 11, 2024
7d20e27
fix: fix eth collection display on marketplace due to floorPrice,tota…
hthieu1110 Jan 12, 2024
21fb6ac
Merge branch 'feat/p2e-eth' of https://github.com/TERITORI/teritori-d…
hthieu1110 Jan 12, 2024
3bb16e8
fix: fix floorPrice + totalVolume bigint
hthieu1110 Jan 12, 2024
58b21eb
chore: remove unneeded graph code related to ethereumProvider
hthieu1110 Jan 12, 2024
a113a3f
fix: fix scientific number => string
hthieu1110 Jan 13, 2024
ab98ba9
fix: fix ether total volume for collection header
hthieu1110 Jan 13, 2024
430f086
chore: clean unneeded code
hthieu1110 Jan 13, 2024
6817321
fix: fetch nft info even if no p2e contract defined
n0izn0iz Jan 13, 2024
ac858b3
fix: enable testnet riot gen0 secondary market
n0izn0iz Jan 13, 2024
f17e5a4
chore: update networks.json
n0izn0iz Jan 13, 2024
82ca28f
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 15, 2024
beb2f32
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 16, 2024
f5bbd75
chore: lint
n0izn0iz Jan 16, 2024
dc9f594
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 16, 2024
ebcdf29
chore: regen
n0izn0iz Jan 16, 2024
8044ec7
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 16, 2024
947d9d4
chore: revert typo
n0izn0iz Jan 16, 2024
9c863ab
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 17, 2024
a4c7cba
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 22, 2024
7f9655d
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 23, 2024
6319d29
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 23, 2024
94e1706
fix: docker builds
n0izn0iz Jan 23, 2024
1272195
chore: codegen
n0izn0iz Jan 23, 2024
76051eb
fix: netlify build
n0izn0iz Jan 23, 2024
87b704f
chore: remove artifact
n0izn0iz Jan 23, 2024
1f6e836
fix: polygon icons
n0izn0iz Jan 23, 2024
ef68d1a
Merge remote-tracking branch 'teritori/main' into feat/p2e-eth
n0izn0iz Jan 26, 2024
3782294
Merge remote-tracking branch 'origin/main' into feat/p2e-eth
hthieu1110 Jan 29, 2024
2099f21
fix: support mainnet indexer for ethereum
hthieu1110 Jan 29, 2024
b23ca0a
feat: update all needed addresses for mainnet eth + polygon
hthieu1110 Jan 31, 2024
66f0a38
chore: merge with main
hthieu1110 Jan 31, 2024
1998f2c
fix: fix prefix of riotOriginalCollectionIdGen0 for polygon
hthieu1110 Jan 31, 2024
cba4b5a
fix: fix prefix of riotOriginalCollectionIdGen0 for polygon
hthieu1110 Jan 31, 2024
ed0606c
fix: deps
n0izn0iz Jan 31, 2024
ae7792e
chore: revert unneeded change
n0izn0iz Jan 31, 2024
b770ff2
chore: regen
n0izn0iz Jan 31, 2024
8396d3b
feat: infra scripts
n0izn0iz Jan 29, 2024
1a890db
fix: use correct args for evm indexer
n0izn0iz Jan 31, 2024
0ddcf1f
fix: substreams path for polygon
hthieu1110 Jan 31, 2024
d975082
Merge branch 'feat/p2e-eth' of https://github.com/TERITORI/teritori-d…
hthieu1110 Jan 31, 2024
138d2b8
fix: fix substreams path
hthieu1110 Jan 31, 2024
b51cc25
fix: add batchBlocks + add squadv3 on polygon
hthieu1110 Jan 31, 2024
76c2b7d
chore: merge with main
hthieu1110 Feb 2, 2024
c94ff75
fix: axelar lib
hthieu1110 Feb 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "1.0.0",
"main": "node_modules/expo/AppEntry.js",
"scripts": {
"start": "expo start",
"patch-axelar": "[ ! -d 'node_modules/@axelar-network/axelarjs-types/axelar' ] && cp -r node_modules/@axelar-network/axelarjs-types/build/module/axelar node_modules/@axelar-network/axelarjs-types/axelar",
"start": "yarn patch-axelar; expo start",
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web",
Expand All @@ -20,7 +21,7 @@
},
"engineStrict": true,
"dependencies": {
"@axelar-network/axelarjs-sdk": "^0.13.6",
"@axelar-network/axelarjs-sdk": "^0.13.9",
"@chain-registry/types": "^0.17.1",
"@cosmjs/amino": "0.32.2",
"@cosmjs/cosmwasm-stargate": "0.32.2",
Expand Down
4 changes: 1 addition & 3 deletions packages/components/navigation/Navigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { MyCollectionScreen } from "../../screens/MyCollection/MyCollectionScree
import { OrganizationDeployerScreen } from "../../screens/Organizations/OrganizationDeployerScreen";
import { OrganizationsScreen } from "../../screens/Organizations/OrganizationsScreen";
import { RiotGameBreedingScreen } from "../../screens/RiotGame/RiotGameBreedingScreen";
// import { RiotGameBridgeScreen } from "../../screens/RiotGame/RiotGameBridgeScreen";
import { RiotGameBridgeScreen } from "../../screens/RiotGame/RiotGameBridgeScreen";
import { RiotGameEnrollScreen } from "../../screens/RiotGame/RiotGameEnrollScreen";
import { RiotGameFightScreen } from "../../screens/RiotGame/RiotGameFightScreen";
import { RiotGameInventoryScreen } from "../../screens/RiotGame/RiotGameInventoryScreen";
Expand Down Expand Up @@ -185,7 +185,6 @@ export const Navigator: React.FC = () => {
title: screenTitle("Riot Game Inventory"),
}}
/>
{/*
<Nav.Screen
name="RiotGameBridge"
component={RiotGameBridgeScreen}
Expand All @@ -194,7 +193,6 @@ export const Navigator: React.FC = () => {
title: screenTitle("Riot Game Bridge"),
}}
/>
*/}

{/* ==== Wallet Manager */}
<Nav.Screen
Expand Down
1 change: 1 addition & 0 deletions packages/scripts/infra/gen-indexer-deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const genDeployment = (mode: string) => {
const podName = `indexer-${filePrefix}`;

const args: string[] = [];

switch (network.kind) {
case NetworkKind.Ethereum: {
args.push("sink", "--batch-blocks=5");
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ __metadata:
languageName: node
linkType: hard

"@axelar-network/axelarjs-sdk@npm:^0.13.6":
"@axelar-network/axelarjs-sdk@npm:^0.13.9":
version: 0.13.9
resolution: "@axelar-network/axelarjs-sdk@npm:0.13.9"
dependencies:
Expand Down Expand Up @@ -18458,7 +18458,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "teritori-dapp@workspace:."
dependencies:
"@axelar-network/axelarjs-sdk": ^0.13.6
"@axelar-network/axelarjs-sdk": ^0.13.9
"@babel/core": ^7.23.3
"@babel/plugin-proposal-export-namespace-from": ^7.18.9
"@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6
Expand Down
Loading