Merge branch 'staging' of https://github.com/SmartTokenLabs/tokenscript-engine into staging

JamesSmartCell · JamesSmartCell · commit 93fb60594797 · 2024-08-22T21:07:10.000+08:00
diff --git a/javascript/engine-js/src/repo/Repo.ts b/javascript/engine-js/src/repo/Repo.ts
@@ -22,7 +22,7 @@ export class Repo {
 	/**
 	 * Repo cache TTL in seconds
 	 */
-	static REPO_TTL = 3600;
+	static REPO_TTL = 300;
 
 	constructor(protected context: TokenScriptEngine) {
 
diff --git a/javascript/engine-js/src/wallet/EthersAdapter.ts b/javascript/engine-js/src/wallet/EthersAdapter.ts
@@ -331,13 +331,13 @@ export class EthersAdapter implements IWalletAdapter {
 				rpcUrls.map((url, index) => {
 					return {
 						provider: new ethers.JsonRpcProvider(url, chain, { staticNetwork: new Network(chain.toString(), chain) }),
-						stallTimeout: 1500,
+						stallTimeout: 3000,
 						priority: index + 1,
 					}
 				}),
 				chain,
 				{
-					quorum: 2
+					quorum: 1
 				}
 			);
 		} else {
diff --git a/javascript/tokenscript-viewer/src/assets/tokenscripts/smart-cat-loot-prod.tsml b/javascript/tokenscript-viewer/src/assets/tokenscripts/smart-cat-loot-prod.tsml
diff --git a/javascript/tokenscript-viewer/src/assets/tokenscripts/smart-cat-prod-2024-01.tsml b/javascript/tokenscript-viewer/src/assets/tokenscripts/smart-cat-prod-2024-01.tsml
diff --git a/javascript/tokenscript-viewer/src/components/common/card-view/card-popover.tsx b/javascript/tokenscript-viewer/src/components/common/card-view/card-popover.tsx
@@ -191,7 +191,7 @@ export class CardPopover implements IViewBinding {
 			history.replaceState(undefined, undefined, "#" + currentParams.toString());
 		}
 
-		await this.dialog.openDialog(() => this.unloadTokenView());
+		await this.dialog.openDialog(() => this.tokenScript.getViewController().unloadTokenCard());
 	}
 
 	async unloadTokenView() {
diff --git a/javascript/tokenscript-viewer/src/components/common/card-view/card-view.css b/javascript/tokenscript-viewer/src/components/common/card-view/card-view.css
@@ -7,7 +7,7 @@
 	max-height: 700px;
 	display: flex;
 	flex-direction: column;
-	height: calc(100% - 60px);;
+	height: calc(100% - 60px);
 }
 
 .view-loader {
@@ -27,7 +27,6 @@
 	position: relative;
 	flex-grow: 1;
 	display: flex;
-	background: #fff;
 }
 
 .tokenscript-frame {
diff --git a/javascript/tokenscript-viewer/src/components/viewers/alphawallet/alphawallet-viewer.tsx b/javascript/tokenscript-viewer/src/components/viewers/alphawallet/alphawallet-viewer.tsx
@@ -3,7 +3,7 @@ import {AppRoot, ShowToastEventArgs} from "../../app/app";
 import {ITransactionStatus, TokenScript} from "@tokenscript/engine-js/src/TokenScript";
 import {ITokenCollection} from "@tokenscript/engine-js/src/tokens/ITokenCollection";
 import {getSingleTokenMetadata} from "../util/getSingleTokenMetadata";
-import {Card} from "@tokenscript/engine-js/src/tokenScript/Card";
+import {Card, CardType} from "@tokenscript/engine-js/src/tokenScript/Card";
 import {handleTransactionError, showTransactionNotification} from "../util/showTransactionNotification";
 import {getCardButtonClass} from "../util/getCardButtonClass";
 import {ViewBinding} from "../tabbed/viewBinding";
@@ -111,7 +111,6 @@ export class SmartTokenStoreViewer {
 		this.tokenScript.on("TOKENS_UPDATED", (data) => {
 			this.cardButtons = null;
 			this.overflowCardButtons = null;
-			this.infoCard = null;
 			this.loadCards();
 		}, "grid");
 
@@ -124,15 +123,18 @@ export class SmartTokenStoreViewer {
 
 		const cardButtons: JSX.Element[] = [];
 		const overflowCardButtons: JSX.Element[] = [];
-		this.infoCard = null;
 
 		const cards = this.tokenScript.getCards().filterCards();
 
 		for (let [index, card] of cards.entries()){
 
 			let label = card.label;
 
-			if (card.type === "token" && !this.infoCard){
+			if (card.type === "token"){
+				// The card is already loaded, we only need to update other card buttons
+				if (this.infoCard)
+					continue;
+
 				// Show first info card
 				this.infoCard = card;
 				if (!this.infoViewController) {
@@ -145,7 +147,7 @@ export class SmartTokenStoreViewer {
 			}
 
 			if (label === "Unnamed Card")
-				label = card.type === "token" ? "Token Info" : card.type + " Card";
+				label = (card.type as CardType) ? "Token Info" : card.type + " Card";
 
 			try {
 				const enabled = await card.isEnabledOrReason();
diff --git a/javascript/tokenscript-viewer/src/components/viewers/mooar/mooar-viewer.css b/javascript/tokenscript-viewer/src/components/viewers/mooar/mooar-viewer.css
@@ -4,7 +4,7 @@ header {
 }
 
 body, action-overflow-modal .popover-container {
-	background-color: rgb(33, 33, 33) !important;
+	background-color: #292929 !important;
 }
 
 * {
diff --git a/javascript/tokenscript-viewer/src/components/viewers/mooar/mooar-viewer.tsx b/javascript/tokenscript-viewer/src/components/viewers/mooar/mooar-viewer.tsx
@@ -3,7 +3,7 @@ import {AppRoot, ShowToastEventArgs} from "../../app/app";
 import {ITransactionStatus, TokenScript} from "@tokenscript/engine-js/src/TokenScript";
 import {ITokenCollection} from "@tokenscript/engine-js/src/tokens/ITokenCollection";
 import {getSingleTokenMetadata} from "../util/getSingleTokenMetadata";
-import {Card} from "@tokenscript/engine-js/src/tokenScript/Card";
+import {Card, CardType} from "@tokenscript/engine-js/src/tokenScript/Card";
 import {handleTransactionError, showTransactionNotification} from "../util/showTransactionNotification";
 import {getCardButtonClass} from "../util/getCardButtonClass";
 import {ViewBinding} from "../tabbed/viewBinding";
@@ -111,7 +111,6 @@ export class SmartTokenStoreViewer {
 		this.tokenScript.on("TOKENS_UPDATED", (data) => {
 			this.cardButtons = null;
 			this.overflowCardButtons = null;
-			this.infoCard = null;
 			this.loadCards();
 		}, "grid");
 
@@ -124,15 +123,18 @@ export class SmartTokenStoreViewer {
 
 		const cardButtons: JSX.Element[] = [];
 		const overflowCardButtons: JSX.Element[] = [];
-		this.infoCard = null;
 
 		const cards = this.tokenScript.getCards().filterCards();
 
 		for (let [index, card] of cards.entries()){
 
 			let label = card.label;
 
-			if (card.type === "token" && !this.infoCard){
+			if (card.type === "token"){
+				// The card is already loaded, we only need to update other card buttons
+				if (this.infoCard)
+					continue;
+
 				// Show first info card
 				this.infoCard = card;
 				if (!this.infoViewController) {
@@ -145,7 +147,7 @@ export class SmartTokenStoreViewer {
 			}
 
 			if (label === "Unnamed Card")
-				label = card.type === "token" ? "Token Info" : card.type + " Card";
+				label = (card.type as CardType) === "token" ? "Token Info" : card.type + " Card";
 
 			try {
 				const enabled = await card.isEnabledOrReason();
diff --git a/javascript/tokenscript-viewer/src/components/viewers/opensea/opensea-viewer.css b/javascript/tokenscript-viewer/src/components/viewers/opensea/opensea-viewer.css
@@ -117,8 +117,10 @@ opensea-viewer, .opensea-viewer, card-view, .card-container {
 	margin: 0 auto !important;
 	max-height: unset !important;
 	width: 100%;
+	background: #fff;
 }
 
 .tokenscript-frame {
 	border: none !important;
+	border-radius: 0 !important;
 }
diff --git a/javascript/tokenscript-viewer/src/components/viewers/tabbed/viewBinding.tsx b/javascript/tokenscript-viewer/src/components/viewers/tabbed/viewBinding.tsx
@@ -39,7 +39,6 @@ export class ViewBinding extends AbstractViewBinding {
 
 	async unloadTokenView(){
 		(this.view as HTMLDivElement).style.display = "none";
-		await super.unloadTokenView();
 	}
 
 	async renderAttributesTable(){
diff --git a/javascript/tokenscript-viewer/src/integration/constants.ts b/javascript/tokenscript-viewer/src/integration/constants.ts
@@ -105,7 +105,10 @@ export const CHAIN_CONFIG: {[chain: number]: IChainConfig} = {
 	[ChainID.POLYGON]: {
 		rpc: [
 			`https://polygon-mainnet.infura.io/v3/${INFURA_API_KEY}`,
-			//'https://polygon.meowrpc.com'
+			"https://polygon-rpc.com/",
+			"https://rpc-mainnet.matic.quiknode.pro",
+			/*"https://polygon-bor.publicnode.com",
+			"https://polygon.gateway.tenderly.co"*/
 		],
 		explorer: 'https://polygonscan.com/tx/'
 	},

Original file line number	Diff line number	Diff line change
`@@ -331,13 +331,13 @@ export class EthersAdapter implements IWalletAdapter {`
`331`	`331`	`rpcUrls.map((url, index) => {`
`332`	`332`	`return {`
`333`	`333`	`provider: new ethers.JsonRpcProvider(url, chain, { staticNetwork: new Network(chain.toString(), chain) }),`
`334`		`- stallTimeout: 1500,`
	`334`	`+ stallTimeout: 3000,`
`335`	`335`	`priority: index + 1,`
`336`	`336`	`}`
`337`	`337`	`}),`
`338`	`338`	`chain,`
`339`	`339`	`{`
`340`		`- quorum: 2`
	`340`	`+ quorum: 1`
`341`	`341`	`}`
`342`	`342`	`);`
`343`	`343`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ export class CardPopover implements IViewBinding {`
`191`	`191`	`history.replaceState(undefined, undefined, "#" + currentParams.toString());`
`192`	`192`	`}`
`193`	`193`
`194`		`- await this.dialog.openDialog(() => this.unloadTokenView());`
	`194`	`+ await this.dialog.openDialog(() => this.tokenScript.getViewController().unloadTokenCard());`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`async unloadTokenView() {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`max-height: 700px;`
`8`	`8`	`display: flex;`
`9`	`9`	`flex-direction: column;`
`10`		`- height: calc(100% - 60px);;`
	`10`	`+ height: calc(100% - 60px);`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`.view-loader {`
`@@ -27,7 +27,6 @@`
`27`	`27`	`position: relative;`
`28`	`28`	`flex-grow: 1;`
`29`	`29`	`display: flex;`
`30`		`- background: #fff;`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`.tokenscript-frame {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ header {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`body, action-overflow-modal .popover-container {`
`7`		`- background-color: rgb(33, 33, 33) !important;`
	`7`	`+ background-color: #292929 !important;`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`* {`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ opensea-viewer, .opensea-viewer, card-view, .card-container {`
`117`	`117`	`margin: 0 auto !important;`
`118`	`118`	`max-height: unset !important;`
`119`	`119`	`width: 100%;`
	`120`	`+ background: #fff;`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`.tokenscript-frame {`
`123`	`124`	`border: none !important;`
	`125`	`+ border-radius: 0 !important;`
`124`	`126`	`}`